diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-17 16:38:01 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-17 21:47:04 +0200 |
| commit | 16cd84d346f1657560eb4aba78d65bcbc69474fb (patch) | |
| tree | 1d31ca40cbf7ad499d24203b1faa4dc075ec90d6 | |
| parent | e966f942ccfa3e6a467d572fd5897948caf78508 (diff) | |
| download | NetworkManager-16cd84d346f1657560eb4aba78d65bcbc69474fb.tar.gz | |
build/meson: rename platform tests to use same name as autotools
First of all, all file names in our source-tree should be unique. We should
not have stuff like "libnm-core/tests/test-general.c" and "src/tests/test-general.c".
The problem here are the C source files, and consequently also the test
binaries have duplicate names. We should avoid that in general. However,
our binaries should have a matching name with the C source. If
"test-general.c" is not good enough, that needs renaming. Not building
"platform-test-general" out of it.
On the other hand, all our tests should have a filename "*/tests/test-*", like
they do for autotools.
Rename the meson platform tests.
It's also important because "tools/run-nm-test.sh" relies on the test
name to workaround valgrind warnings.
| -rw-r--r-- | src/devices/tests/meson.build | 1 | ||||
| -rw-r--r-- | src/platform/tests/meson.build | 9 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/devices/tests/meson.build b/src/devices/tests/meson.build index 4702c656fc..4b4c5c7ee5 100644 --- a/src/devices/tests/meson.build +++ b/src/devices/tests/meson.build @@ -9,7 +9,6 @@ foreach test_unit: test_units test_unit + '.c', dependencies: test_nm_dep, ) - test( 'devices/' + test_unit, test_script, diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build index 8086a46c9b..b3a9616286 100644 --- a/src/platform/tests/meson.build +++ b/src/platform/tests/meson.build @@ -13,11 +13,10 @@ test_units = [ foreach test_unit: test_units exe = executable( - 'platform-' + test_unit[0], + test_unit[0], test_unit[1], dependencies: test_unit[2], ) - test( 'platform/' + test_unit[0], test_script, @@ -26,10 +25,8 @@ foreach test_unit: test_units ) endforeach -test = 'monitor' - executable( - test, - test + '.c', + 'monitor', + 'monitor.c', dependencies: test_nm_dep, ) |