Improve valgrind test setup

Instead of relying on a complicated regular expression, send the
list of tests to be run under valgrind in as arguments.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>

Author: sgallagher

modulemd/common/tests/test-valgrind.py

@@ -27,30 +27,11 @@
 failed = False
 
 # Get the list of tests to run
-proc_result = subprocess.run(['meson', 'test', '--list'],
-                             stdout=subprocess.PIPE,
-                             encoding='utf-8')
-if proc_result.returncode != 0:
-    sys.exit(2)
-
-unfiltered_tests = proc_result.stdout.split('\n')
 tests = []
-for test in unfiltered_tests:
-    if (not test or
-        test.endswith('_python') or
-        test.endswith('_python_debug') or
-        test.endswith('_python2_debug') or
-        test.endswith('_python3_debug') or
-        test.endswith('_release') or
-        test.endswith('_import_headers') or
-        'v1_release' in test or
-        test == 'autopep8' or
-        test == 'clang_format' or
-        test == 'pycodestyle' or
-        test == 'test_dirty_repo' or
-            test == 'valgrind'):
-        continue
-    tests.append(test)
+if len(sys.argv) > 1:
+    tests = sys.argv[1:]
+else:
+    sys.exit(77)
 
 
 with tempfile.TemporaryDirectory(prefix="libmodulemd_valgrind_") as tmpdirname:

modulemd/meson.build

@@ -296,6 +296,7 @@ if test_dirty_git
          args: dirty_repo_scripts)
 endif
 
+valgrind_tests = []
 
 if build_api_v1
     subdir('v1')
@@ -318,6 +319,6 @@ if valgrind.found()
     modulemd_valgrind_scripts = files('common/tests/test-valgrind.py')
     test ('valgrind', python3,
           env : test_env,
-          args : modulemd_valgrind_scripts,
+          args : modulemd_valgrind_scripts + valgrind_tests,
           timeout : 1200)
 endif

modulemd/v1/meson.build

@@ -96,6 +96,7 @@ test('test_v1_modulemd_buildopts', test_v1_modulemd_buildopts,
      env : test_env)
 test('test_v1_release_modulemd_buildopts', test_v1_modulemd_buildopts,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_buildopts'
 
 test_v1_modulemd_component = executable(
     'test_v1_modulemd_component',
@@ -109,6 +110,7 @@ test('test_v1_modulemd_component', test_v1_modulemd_component,
      env : test_env)
 test('test_v1_release_modulemd_component', test_v1_modulemd_component,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_component'
 
 test_v1_modulemd_defaults = executable(
     'test_v1_modulemd_defaults',
@@ -123,6 +125,7 @@ test('test_v1_modulemd_defaults', test_v1_modulemd_defaults,
      env : test_env)
 test('test_v1_release_modulemd_defaults', test_v1_modulemd_defaults,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_defaults'
 
 test_v1_modulemd_dependencies = executable(
     'test_v1_modulemd_dependencies',
@@ -136,6 +139,7 @@ test('test_v1_modulemd_dependencies', test_v1_modulemd_dependencies,
      env : test_env)
 test('test_v1_release_modulemd_dependencies', test_v1_modulemd_dependencies,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_dependencies'
 
 test_v1_modulemd_intent = executable(
     'test_v1_modulemd_intent',
@@ -149,6 +153,7 @@ test('test_v1_modulemd_intent', test_v1_modulemd_intent,
      env : test_env)
 test('test_v1_release_modulemd_intent', test_v1_modulemd_intent,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_intent'
 
 test_v1_modulemd_module = executable(
     'test_v1_modulemd_module',
@@ -162,6 +167,7 @@ test('test_v1_modulemd_module', test_v1_modulemd_module,
      env : test_env)
 test('test_v1_release_modulemd_module', test_v1_modulemd_module,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_module'
 
 test_v1_modulemd_modulestream = executable(
     'test_v1_modulemd_modulestream',
@@ -175,6 +181,7 @@ test('test_v1_modulemd_modulestream', test_v1_modulemd_modulestream,
      env : test_env)
 test('test_v1_release_modulemd_modulestream', test_v1_modulemd_modulestream,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_modulestream'
 
 test_v1_modulemd_regressions = executable(
     'test_v1_modulemd_regressions',
@@ -188,6 +195,7 @@ test('test_v1_modulemd_regressions', test_v1_modulemd_regressions,
     env : test_env)
 test('test_v1_release_modulemd_regressions', test_v1_modulemd_regressions,
     env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_regressions'
 
 test_v1_modulemd_servicelevel = executable(
     'test_v1_modulemd_servicelevel',
@@ -201,6 +209,7 @@ test('test_v1_modulemd_servicelevel', test_v1_modulemd_servicelevel,
      env : test_env)
 test('test_v1_release_modulemd_servicelevel', test_v1_modulemd_servicelevel,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_servicelevel'
 
 test_v1_modulemd_simpleset = executable(
     'test_v1_modulemd_simpleset',
@@ -214,6 +223,7 @@ test('test_v1_modulemd_simpleset', test_v1_modulemd_simpleset,
      env : test_env)
 test('test_v1_release_modulemd_simpleset', test_v1_modulemd_simpleset,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_simpleset'
 
 test_v1_modulemd_subdocument = executable(
     'test_v1_modulemd_subdocument',
@@ -227,6 +237,7 @@ test('test_v1_modulemd_subdocument', test_v1_modulemd_subdocument,
      env : test_env)
 test('test_v1_release_modulemd_subdocument', test_v1_modulemd_subdocument,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_subdocument'
 
 
 test_v1_modulemd_translation = executable(
@@ -243,6 +254,7 @@ test('test_v1_modulemd_translation',
 test('test_v1_release_modulemd_translation',
      test_v1_modulemd_translation,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_translation'
 
 
 test_v1_modulemd_translation_entry = executable(
@@ -259,6 +271,7 @@ test('test_v1_modulemd_translation_entry',
 test('test_v1_release_modulemd_translation_entry',
      test_v1_modulemd_translation_entry,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_translation_entry'
 
 
 test_v1_modulemd_yaml = executable(
@@ -274,6 +287,7 @@ test('test_v1_modulemd_yaml', test_v1_modulemd_yaml,
      env : test_env)
 test('test_v1_release_modulemd_yaml', test_v1_modulemd_yaml,
      env : test_release_env)
+valgrind_tests += 'test_v1_modulemd_yaml'
 
 # Test env with fatal warnings and criticals
 py_test_env = test_env
@@ -301,6 +315,7 @@ test ('test_v1_release_modulemd_python', python3,
       env : py_test_release_env,
       args : modulemd_python_scripts)
 
+
 if skip_introspection
 else
     gnome.generate_gir(

modulemd/v2/meson.build

@@ -170,6 +170,8 @@ foreach name, sources : v2_c_tests
          env : test_env)
     test(name + '_release', exe,
          env : test_release_env)
+
+    valgrind_tests += name + '_debug'
 endforeach