diff options
| author | Philip Withnall <philip@tecnocode.co.uk> | 2022-07-24 18:44:11 +0000 |
|---|---|---|
| committer | Philip Withnall <philip@tecnocode.co.uk> | 2022-07-24 18:44:11 +0000 |
| commit | 101be84d2f6b1f2b41300e6abd444b756b6d71a5 (patch) | |
| tree | 0f4481816ec8bd079d63237bec0c6860c72e06d4 | |
| parent | e9c8070bfd2fa93833a23357523c286fb0c3cd83 (diff) | |
| parent | 72868c026d5df70a0b4729c9dad193df3ee4961a (diff) | |
| download | glib-101be84d2f6b1f2b41300e6abd444b756b6d71a5.tar.gz | |
Merge branch 'wip/smcv/installed-tests' into 'main'
Fix installed-tests failures
See merge request GNOME/glib!2833
| -rwxr-xr-x | glib/tests/assert-msg-test.py | 4 | ||||
| -rw-r--r-- | gobject/tests/performance/meson.build | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/glib/tests/assert-msg-test.py b/glib/tests/assert-msg-test.py index d2c8f1451..01bedce91 100755 --- a/glib/tests/assert-msg-test.py +++ b/glib/tests/assert-msg-test.py @@ -64,7 +64,9 @@ class TestAssertMessage(unittest.TestCase): os.environ["G_TEST_BUILDDIR"], "assert-msg-test" ) 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) def runAssertMessage(self, *args): diff --git a/gobject/tests/performance/meson.build b/gobject/tests/performance/meson.build index 8ff47cc0b..22bf79da0 100644 --- a/gobject/tests/performance/meson.build +++ b/gobject/tests/performance/meson.build @@ -20,10 +20,10 @@ foreach test_name, extra_args : gobject_tests if install test_conf = configuration_data() 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', '') configure_file( - input: installed_tests_template_tap, + input: installed_tests_template, output: test_name + '.test', install_dir: installed_tests_metadir, configuration: test_conf, |