From 738a59795329f49f35c3ff7632e19f6c1706ad29 Mon Sep 17 00:00:00 2001
From: Gilles Peskine <Gilles.Peskine@arm.com>
Date: Thu, 3 Oct 2024 18:52:58 +0200
Subject: [PATCH] Adjust paths for impending moves to the framework

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
---
 docs/architecture/testing/test-framework.md | 2 +-
 tests/scripts/analyze_outcomes.py           | 3 ++-
 tests/scripts/check_test_cases.py           | 2 +-
 tests/scripts/components-basic-checks.sh    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/architecture/testing/test-framework.md b/docs/architecture/testing/test-framework.md
index 80667df920..a9e3dac47e 100644
--- a/docs/architecture/testing/test-framework.md
+++ b/docs/architecture/testing/test-framework.md
@@ -22,7 +22,7 @@ Each test case has a description which succinctly describes for a human audience
 * Make the description descriptive. “foo: x=2, y=4” is more descriptive than “foo #2”. “foo: 0<x<y, both even” is even better if these inequalities and parities are why this particular test data was chosen.
 * Avoid changing the description of an existing test case without a good reason. This breaks the tracking of failures across CI runs, since this tracking is based on the descriptions.
 
-`tests/scripts/check_test_cases.py` enforces some rules and warns if some guidelines are violated.
+`framework/scripts/check_test_cases.py` enforces some rules and warns if some guidelines are violated.
 
 ## TLS tests
 
diff --git a/tests/scripts/analyze_outcomes.py b/tests/scripts/analyze_outcomes.py
index 080a4fb589..c40dab55e6 100755
--- a/tests/scripts/analyze_outcomes.py
+++ b/tests/scripts/analyze_outcomes.py
@@ -8,7 +8,8 @@ less likely to be useful.
 
 import re
 
-import outcome_analysis
+import scripts_path # pylint: disable=unused-import
+from mbedtls_framework import outcome_analysis
 
 
 class CoverageTask(outcome_analysis.CoverageTask):
diff --git a/tests/scripts/check_test_cases.py b/tests/scripts/check_test_cases.py
index b00319bad7..f1185d2f7c 100755
--- a/tests/scripts/check_test_cases.py
+++ b/tests/scripts/check_test_cases.py
@@ -14,7 +14,7 @@ import re
 import sys
 
 import scripts_path # pylint: disable=unused-import
-import collect_test_cases
+from mbedtls_framework import collect_test_cases
 
 
 class DescriptionChecker(collect_test_cases.TestDescriptionExplorer):
diff --git a/tests/scripts/components-basic-checks.sh b/tests/scripts/components-basic-checks.sh
index 053aacfe7f..d28f3b371a 100644
--- a/tests/scripts/components-basic-checks.sh
+++ b/tests/scripts/components-basic-checks.sh
@@ -68,7 +68,7 @@ component_check_test_cases () {
     else
         opt=''
     fi
-    tests/scripts/check_test_cases.py -q $opt
+    framework/scripts/check_test_cases.py -q $opt
     unset opt
 }