diff options
| author | Jeremy Johnson <jeremy.johnson@arm.com> | 2023-10-04 16:55:04 +0100 |
|---|---|---|
| committer | Jeremy Johnson <jeremy.johnson@arm.com> | 2023-10-12 10:43:09 +0100 |
| commit | 9c2fe6e129e4d176c3e14f172b92efe985af7c78 (patch) | |
| tree | 800cf636566d68e0558f0dd35d8391be5215cd4a /verif/runner | |
| parent | 59b307d5b1090680d1918745ee54c8466df4861d (diff) | |
| download | reference_model-9c2fe6e129e4d176c3e14f172b92efe985af7c78.tar.gz | |
Conformance simple backward version and binary files support
Add --test-version option to tosa_verif_conformance_generator to
select the version for tests to output.
Add --output-type to allow json, binary or both files to be created
during conformance generation.
Fix passing schema_path to test runner.
Add explicit verify lib path arg to test runner.
Change-Id: I5f1ad137d713fca408a98470ea77bddf8916c5f3
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>
Diffstat (limited to 'verif/runner')
| -rw-r--r-- | verif/runner/tosa_test_runner.py | 5 | ||||
| -rw-r--r-- | verif/runner/tosa_verif_run_tests.py | 13 |
2 files changed, 14 insertions, 4 deletions
diff --git a/verif/runner/tosa_test_runner.py b/verif/runner/tosa_test_runner.py index 30a7168..b348f50 100644 --- a/verif/runner/tosa_test_runner.py +++ b/verif/runner/tosa_test_runner.py @@ -4,7 +4,6 @@ import json from enum import IntEnum -import conformance.model_files as cmf import schemavalidation.schemavalidation as sch from checker.color_print import LogColors from checker.color_print import print_color @@ -71,9 +70,7 @@ class TosaTestRunner: self.testDir = str(testDirPath) self.testDirPath = testDirPath self.testName = self.testDirPath.name - self.verify_lib_path = cmf.find_tosa_file( - cmf.TosaFileType.VERIFY_LIBRARY, args.ref_model_path - ) + self.verify_lib_path = args.verify_lib_path set_print_in_color(not args.no_color) # Stop the result checker printing anything - we will do it diff --git a/verif/runner/tosa_verif_run_tests.py b/verif/runner/tosa_verif_run_tests.py index d1755e6..54cb7b2 100644 --- a/verif/runner/tosa_verif_run_tests.py +++ b/verif/runner/tosa_verif_run_tests.py @@ -52,6 +52,15 @@ def parseArgs(argv): help="Path to TOSA reference model executable", ) parser.add_argument( + "--verify-lib-path", + dest="verify_lib_path", + type=Path, + help=( + "Path to TOSA verify library. Defaults to " + "the library in the directory of `ref-model-path`" + ), + ) + parser.add_argument( "--operator-fbs", "--schema-path", dest="schema_path", @@ -365,6 +374,10 @@ def main(argv=None): args.ref_model_path = cmf.find_tosa_file( cmf.TosaFileType.REF_MODEL, Path("reference_model"), False ) + if args.verify_lib_path is None: + args.verify_lib_path = cmf.find_tosa_file( + cmf.TosaFileType.VERIFY_LIBRARY, args.ref_model_path + ) if args.flatc_path is None: args.flatc_path = cmf.find_tosa_file( cmf.TosaFileType.FLATC, args.ref_model_path |