From: Simon McVittie <smcv@collabora.com>
Date: Wed, 13 Jul 2022 18:31:33 +0000 (+0100)
Subject: test: Don't prepend test- to the names of manual tests
X-Git-Tag: dbus-1.15.0~32^2~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a88f360ca42abd76d791c7e246197bda731e5f;p=thirdparty%2Fdbus.git

test: Don't prepend test- to the names of manual tests

This makes them consistent with what we do in Autotools.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---

diff --git a/test/meson.build b/test/meson.build
index 43ae3e934..e63609008 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -292,14 +292,14 @@ endif
 
 tests += [
     {
-        'name': 'service',
+        'name': 'test-service',
         'srcs': [ 'test-service.c' ],
         'link': [ libdbus_testutils, ],
         'install': true,
         'test': false,
     },
     {
-        'name': 'sleep-forever',
+        'name': 'test-sleep-forever',
         'srcs': [ 'test-sleep-forever.c' ],
         'link': [ libdbus_testutils, ],
         'install': true,
@@ -544,6 +544,12 @@ foreach test: tests
     suites = test.get('suite', ['dbus'])
     install = test.get('install', true)
 
+    if test.get('test', true)
+        exe_name = 'test-' + name
+    else
+        exe_name = name
+    endif
+
     if 'slow' in suites
         timeout = 300
     else
@@ -552,7 +558,7 @@ foreach test: tests
 
     timeout = test.get('timeout', timeout)
 
-    test_exe = executable('test-' + name,
+    test_exe = executable(exe_name,
         srcs,
         link_with: link,
         dependencies: deps,
@@ -577,8 +583,8 @@ foreach test: tests
 
     if install and test.get('test', true)
         installed_tests += [{
-            'name': 'test-' + test.get('name'),
-            'exe': 'test-' + test.get('name') + exe_ext,
+            'name': exe_name,
+            'exe': exe_name + exe_ext,
         }]
     endif
 endforeach