summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2019-02-22 09:08:06 +0100
committerThomas Haller <thaller@redhat.com>2019-02-23 07:24:35 +0100
commit5466edc63e38352e06a8328f512b8c3620757321 (patch)
tree44e390273d827f5e8daa2179418afd83307d417d
parentb1f6d53bc442de3fac52462bcfdf07900a89d241 (diff)
downloadNetworkManager-5466edc63e38352e06a8328f512b8c3620757321.tar.gz
build/meson: name platform tests like autotools
Meson and autotools should name the tests the same way. Also, all tests binaries built by autotools start on purpose with "test-". Do that for meson too. Also, otherwise "tools/run-nm-test.sh" fails to workaround valgrind failures for platform tests as it does not expect the tests to be named that way: if [ $HAS_ERRORS -eq 0 ]; then # valgrind doesn't support setns syscall and spams the logfile. # hack around it... if [ "$TEST_NAME" = 'test-link-linux' -o \ "$TEST_NAME" = 'test-acd' ]; then if [ -z "$(sed -e '/^--[0-9]\+-- WARNING: unhandled .* syscall: /,/^--[0-9]\+-- it at http.*\.$/d' "$LOGFILE")" ]; then HAS_ERRORS=1 fi fi fi
-rw-r--r--src/platform/tests/meson.build4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
index 8086a46c9b..19867f7404 100644
--- a/src/platform/tests/meson.build
+++ b/src/platform/tests/meson.build
@@ -13,13 +13,13 @@ 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_unit[0],
test_script,
timeout: test_unit[3],
args: test_args + [exe.full_path()],