From 76c6a556c7396ee6468780b57676e5821c55b1e4 Mon Sep 17 00:00:00 2001 From: Jeremy Johnson Date: Mon, 11 Sep 2023 09:30:02 +0100 Subject: Fixes for conformance generator tags and test selection Incorrectly used "tag" in test.desc instead of "tags" Incorrectly selected all tests rather than just all positive tests depending on operator selection option. Signed-off-by: Jeremy Johnson Change-Id: Ib257bc57accf745beedfa4a3b2ece9539c0972c2 --- .../tosa_verif_conformance_generator.py | 38 ++++++++++++++-------- 1 file changed, 25 insertions(+), 13 deletions(-) (limited to 'verif/conformance/tosa_verif_conformance_generator.py') diff --git a/verif/conformance/tosa_verif_conformance_generator.py b/verif/conformance/tosa_verif_conformance_generator.py index c2ea4ec..236f729 100644 --- a/verif/conformance/tosa_verif_conformance_generator.py +++ b/verif/conformance/tosa_verif_conformance_generator.py @@ -805,10 +805,7 @@ def main(): # Selection criteria selection_config = test_params[op]["selection"][selector_name] - if args.convert_all_tests or ( - "all" in selection_config - and selection_config["all"] == "true" - ): + if args.convert_all_tests: logger.debug(f"Running and converting all {op} tests") generate_results( args, profile, op, op_build_dir, supports=supports @@ -819,16 +816,31 @@ def main(): f"Running and converting selection of {op} tests" ) if test_type in ["positive", "both"]: - tests_gen, tests_gen2 = tee( - get_op_tests_selection( - args, - profile, - op, - op_build_dir, - selection_config, - ignore_missing=ignore_missing, + if ( + "all" in selection_config + and selection_config["all"] == "true" + ): + # Just get all the positive tests + tests_gen, tests_gen2 = tee( + _get_all_tests_list( + profile, + op_build_dir, + op, + exclude_negative_tests=True, + ) + ) + else: + # Get a selection of positive tests + tests_gen, tests_gen2 = tee( + get_op_tests_selection( + args, + profile, + op, + op_build_dir, + selection_config, + ignore_missing=ignore_missing, + ) ) - ) generate_results( args, profile, -- cgit v1.2.1