From: Thomas Huth <th...@redhat.com>
We are going to move target-specific tests to subfolders that are
named after the target (and generic tests will be put into a "generic"
folder), so prepare the meson.build file to allow such locations, too.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
tests/functional/meson.build | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tests/functional/meson.build b/tests/functional/meson.build
index d0c01303654..449a1d5c402 100644
--- a/tests/functional/meson.build
+++ b/tests/functional/meson.build
@@ -422,7 +422,13 @@ foreach speed : ['quick', 'thorough']
foreach test : target_tests
testname = '@0@-@1@'.format(target_base, test)
- testfile = 'test_' + test + '.py'
+ if fs.exists('test_' + test + '.py')
+ testfile = 'test_' + test + '.py'
+ elif fs.exists('generic' / 'test_' + test + '.py')
+ testfile = 'generic' / 'test_' + test + '.py'
+ else
+ testfile = target_base / 'test_' + test + '.py'
+ endif
testpath = meson.current_source_dir() / testfile
teststamp = testname + '.tstamp'
test_precache_env = environment()
--
2.50.1
