diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/meson.build | 9 | ||||
| -rwxr-xr-x | test/run_test_suite.py | 13 |
2 files changed, 13 insertions, 9 deletions
diff --git a/test/meson.build b/test/meson.build index 2cf3f32c..95fa9587 100644 --- a/test/meson.build +++ b/test/meson.build @@ -247,12 +247,12 @@ if is_variable('serdi') timeout: 240) endforeach - ### The terse suite needs to be run with -t + ### The terse suite needs to be run with -o terse test('terse', run_test_suite, args: script_args + ['--osyntax', 'turtle', files('terse/manifest.ttl'), serd_base + 'terse/', - '--', '-t'], + '--', '-o', 'terse'], env: test_env, suite: ['rdf', 'serd'], timeout: 240) @@ -260,7 +260,7 @@ if is_variable('serdi') manifest = files('pattern' / 'manifest.ttl') base_uri = serd_base + 'pattern' + '/' test('pattern', run_test_suite, - args: script_args + [manifest, base_uri, '--', '-x'], + args: script_args + [manifest, base_uri, '--', '-i', 'variables'], env: test_env, suite: ['rdf', 'serd'], timeout: 240) @@ -287,7 +287,8 @@ if is_variable('serdi') ### ... and once with lax parsing to tolerate them test('lax.lax', run_test_suite, - args: script_args + [lax_manifest, lax_base_uri, '--', '-l'], + args: script_args + [lax_manifest, lax_base_uri, '--', + '-i', 'lax', '-o', 'lax'], env: test_env, is_parallel: false, suite: ['rdf', 'serd'], diff --git a/test/run_test_suite.py b/test/run_test_suite.py index 0d865c1f..1c5a7cf3 100755 --- a/test/run_test_suite.py +++ b/test/run_test_suite.py @@ -26,7 +26,7 @@ def log_error(message): def test_osyntax_options(osyntax): if osyntax.lower() == "ntriples" or osyntax.lower() == "nquads": - return ["-a"] + return ["-o", "ascii"] return [] @@ -80,7 +80,8 @@ def test_thru( "foo", "-w", thru_path, - "-a", + "-o", + "ascii", "-I", base_uri, out_path, @@ -243,9 +244,10 @@ def test_suite( test_path = os.path.join(test_dir, test_name) command = command_prefix + [ - "-a", "-o", osyntax, + "-o", + "ascii", "-I", test_uri, test_path, @@ -305,9 +307,10 @@ def test_suite( model_command = command_prefix + [ "-m", - "-a", "-o", osyntax, + "-o", + "ascii", "-w", out_filename, "-I", @@ -365,7 +368,7 @@ def test_suite( if test_class.startswith(ns_rdftest): expected = ( 1 - if "-l" not in command_prefix and "Negative" in test_class + if "lax" not in command_prefix and "Negative" in test_class else 0 ) run_tests(test_class, instances, expected, results) |