From 401d022a26ab66076f0e90bd678e1e810aef36fb Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 25 Feb 2023 14:02:17 +0000 Subject: resulttool/regression: Ensure LTP results are only compared against other LTP runs If a test result contains LTP test results, it should only be compared with other runs containing LTP test results. (From OE-Core rev: 4dbbf2f4a85620a08dc2fa65095dc17fe6c530f8) Signed-off-by: Richard Purdie --- scripts/lib/resulttool/regression.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/lib/resulttool/regression.py b/scripts/lib/resulttool/regression.py index 1b0c8335a3..04a2f3fbb0 100644 --- a/scripts/lib/resulttool/regression.py +++ b/scripts/lib/resulttool/regression.py @@ -146,6 +146,7 @@ def can_be_compared(logger, base, target): run with different tests sets or parameters. Return true if tests can be compared """ + ret = True base_configuration = base['configuration'] target_configuration = target['configuration'] @@ -165,7 +166,11 @@ def can_be_compared(logger, base, target): logger.debug(f"Enriching {target_configuration['STARTTIME']} with {guess}") target_configuration['OESELFTEST_METADATA'] = guess - return metadata_matches(base_configuration, target_configuration) \ + # Test runs with LTP results in should only be compared with other runs with LTP tests in them + if base_configuration.get('TEST_TYPE') == 'runtime' and any(result.startswith("ltpresult") for result in base['result']): + ret = target_configuration.get('TEST_TYPE') == 'runtime' and any(result.startswith("ltpresult") for result in target['result']) + + return ret and metadata_matches(base_configuration, target_configuration) \ and machine_matches(base_configuration, target_configuration) -- cgit v1.2.3-54-g00ecf