commit f0348ea4206a7e02497515ffb6d88546e0121cc7
author Jeremy Johnson <jeremy.johnson@arm.com> Wed Sep 27 16:10:59 2023 +0100
committer Eric Kunze <eric.kunze@arm.com> Thu Sep 28 18:27:41 2023 +0000
tree 35a003fdff5208864b6b85dff005ce0127ff649a
parent f9c0ceea99e197ab14f779eb51c5e1479dbeb4dd

Refactor path arguments to tosa-tools

tosa_verif_conformance_generator
- Move to using ref-model-path instead of ref-model-dir
- Add schema-path and flatc-path
- Add model_files module to locate default places for files
convert2conformance
- Remove default paths
verifier
- Switch to using exact path of verifier library
tosa_verif_run_tests
- Use conformance model_files to locate defaults

Change-Id: Ieca3b164670e2a7dcb047743667cc4e8317daa97
Signed-off-by: Josef Malmström <josef.malmstrom@arm.com>
Signed-off-by: Jeremy Johnson <jeremy.johnson@arm.com>

verif/runner/tosa_test_runner.py

diff --git a/verif/runner/tosa_test_runner.py b/verif/runner/tosa_test_runner.py
index d8c2a87..579dd60 100644
--- a/verif/runner/tosa_test_runner.py
+++ b/verif/runner/tosa_test_runner.py
@@ -1,9 +1,8 @@
 """Template test runner class for running TOSA tests."""
-# Copyright (c) 2020-2022, ARM Limited.
+# Copyright (c) 2020-2023, ARM Limited.
 # SPDX-License-Identifier: Apache-2.0
 import json
 from enum import IntEnum
-from pathlib import Path
 
 from checker.tosa_result_checker import LogColors
 from checker.tosa_result_checker import print_color
@@ -62,8 +61,8 @@
         if args.binary and tosaFilePath.suffix == ".json":
             # Convert tosa JSON to binary
             json2fbbin.json_to_fbbin(
-                Path(args.flatc_path),
-                Path(args.operator_fbs),
+                args.flatc_path,
+                args.schema_path,
                 tosaFilePath,
                 testDirPath,
             )