luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-27 04:32:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/smcv/installed-tests' into 'main'

Browse Source 
Fix installed-tests failures

See merge request GNOME/glib!2833
This commit is contained in:
Philip Withnall 2022-07-24 18:44:11 +00:00
commit 101be84d2f
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/tests/assert-msg-test.py
View File

@ -64,7 +64,9 @@ class TestAssertMessage(unittest.TestCase):
os.environ["G_TEST_BUILDDIR"], "assert-msg-test" os.environ["G_TEST_BUILDDIR"], "assert-msg-test"
) )
else: else:
self.__assert_msg_test = shutil.which("assert-msg-test") self.__assert_msg_test = os.path.join(
os.path.dirname(__file__), "assert-msg-test"
)
print("assert-msg-test:", self.__assert_msg_test) print("assert-msg-test:", self.__assert_msg_test)
def runAssertMessage(self, *args): def runAssertMessage(self, *args):

4
gobject/tests/performance/meson.build
View File

@ -20,10 +20,10 @@ foreach test_name, extra_args : gobject_tests
if install if install
test_conf = configuration_data() test_conf = configuration_data()
test_conf.set('installed_tests_dir', installed_tests_execdir) test_conf.set('installed_tests_dir', installed_tests_execdir)
test_conf.set('program', test_name) test_conf.set('program', '@0@ --seconds 1'.format(test_name))
test_conf.set('env', '') test_conf.set('env', '')
configure_file( configure_file(
input: installed_tests_template_tap, input: installed_tests_template,
output: test_name + '.test', output: test_name + '.test',
install_dir: installed_tests_metadir, install_dir: installed_tests_metadir,
configuration: test_conf, configuration: test_conf,