From 5551b3ab557a7204cce2a657ae7b279ee4b05af6 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Sat, 23 Feb 2019 07:36:53 +0100 Subject: [PATCH] Revert "build/meson: name platform tests like autotools" Older versions of meson don't support building the same names multiple times. Meson encountered an error in file src/tests/meson.build, line 14, column 2: Tried to create target "test-general", but a target of that name already exists. We really need to use unique filenames everywhere. Revert the name change for now. This breaks again the valgrind workaround in "tools/run-nm-test.sh". This reverts commit 5466edc63e38352e06a8328f512b8c3620757321. --- src/platform/tests/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build index 19867f7404..8086a46c9b 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( - test_unit[0], + 'platform-' + test_unit[0], test_unit[1], dependencies: test_unit[2], ) test( - test_unit[0], + 'platform/' + test_unit[0], test_script, timeout: test_unit[3], args: test_args + [exe.full_path()],