diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-04-15 08:20:31 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-04-28 11:32:58 +0200 |
| commit | ecd1bfdd3cea0a11c4ba1a6a7dbc86d868349877 (patch) | |
| tree | e40fa1c349a1d66bba1f9c8ec5042287774a8a62 /test/meson.build | |
| parent | mkosi,man: bump fedora version (diff) | |
| download | systemd-ecd1bfdd3cea0a11c4ba1a6a7dbc86d868349877.tar.xz systemd-ecd1bfdd3cea0a11c4ba1a6a7dbc86d868349877.zip | |
hwdb-test: pass an explit path to systemd-hwdb
https://github.com/systemd/systemd/pull/19316 failed with:
[1065/1670] Linking target systemd-hwdb
--- command ---
14:28:29 /root/src/test/hwdb-test.sh
--- stdout ---
./systemd-hwdb does not exist, please build first
I'm not sure what is going on here… In principle meson says that tests may be
called from any directory, but in practice is was always the build directory.
So far we were relying on systemd-hwdb being present in '.', and this worked.
Either way, it's nicer to pass the exact path, so let's do that.
Diffstat (limited to '')
| -rw-r--r-- | test/meson.build | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/test/meson.build b/test/meson.build index 4d7b929a80..ee6733fca4 100644 --- a/test/meson.build +++ b/test/meson.build @@ -57,10 +57,8 @@ if install_tests endif test_network_generator_conversion_sh = find_program('test-network-generator-conversion.sh') - -############################################################ - test_systemd_tmpfiles_py = find_program('test-systemd-tmpfiles.py') +hwdb_test_sh = find_program('hwdb-test.sh') ############################################################ @@ -128,17 +126,6 @@ endif ############################################################ -if conf.get('ENABLE_HWDB') == 1 - hwdb_test_sh = find_program('hwdb-test.sh') - if want_tests != 'false' - test('hwdb-test', - hwdb_test_sh, - timeout : 90) - endif -endif - -############################################################ - if want_tests != 'false' and dmi_arches.contains(host_machine.cpu_family()) udev_dmi_memory_id_test = find_program('udev-dmi-memory-id-test.sh') |