diff options
| -rw-r--r-- | meson.build | 5 | ||||
| -rwxr-xr-x | src/tools/testwrap | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 47c8fcdc532..286d7e42698 100644 --- a/meson.build +++ b/meson.build @@ -3252,8 +3252,9 @@ foreach test_dir : tests testport += 1 elif kind == 'tap' + testwrap_tap = testwrap_base if not tap_tests_enabled - continue + testwrap_tap += ['--skip', 'TAP tests not enabled'] endif test_command = [ @@ -3293,7 +3294,7 @@ foreach test_dir : tests test(test_dir['name'] / onetap_p, python, kwargs: test_kwargs, - args: testwrap_base + [ + args: testwrap_tap + [ '--testgroup', test_dir['name'], '--testname', onetap_p, '--', test_command, diff --git a/src/tools/testwrap b/src/tools/testwrap index 7a64fe76a2d..d01e61051cb 100755 --- a/src/tools/testwrap +++ b/src/tools/testwrap @@ -12,6 +12,7 @@ parser.add_argument('--srcdir', help='source directory of test', type=str) parser.add_argument('--basedir', help='base directory of test', type=str) parser.add_argument('--testgroup', help='test group', type=str) parser.add_argument('--testname', help='test name', type=str) +parser.add_argument('--skip', help='skip test (with reason)', type=str) parser.add_argument('test_command', nargs='*') args = parser.parse_args() @@ -23,6 +24,10 @@ print('# executing test in {} group {} test {}'.format( testdir, args.testgroup, args.testname)) sys.stdout.flush() +if args.skip is not None: + print('1..0 # Skipped: ' + args.skip) + sys.exit(0) + if os.path.exists(testdir) and os.path.isdir(testdir): shutil.rmtree(testdir) os.makedirs(testdir) |