runtests.py: Optimize availability

1. Enhance the availability of runtests.py, not affected by the tests directory. 2. emr-oe/tests-pmu: fix dependency detection. Signed-off-by: Haoliang Zhu <[email protected]>
intel · Jul 2, 2024 · 07ba370 · 07ba370
1 parent 11b34db
commit 07ba370
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/BM/runtests.py b/BM/runtests.py
@@ -33,12 +33,12 @@ def parse_line(line):
         return info, reason_info
     return None, None
 
-def dependency_check(ftests, feature_dir):
+def dependency_check(ftests):
     common_dir = f"{BM_dir}/common"
     cpuid_dir = f"{BM_dir}/tools/cpuid_check"
 
     # Add the necessary environment variables.
-    os.environ['PATH'] += os.pathsep + os.pathsep.join([common_dir, cpuid_dir, feature_dir])
+    os.environ['PATH'] += os.pathsep + os.pathsep.join([common_dir, cpuid_dir])
 
     # Check the dependency.
     with open(ftests, 'r') as file:
@@ -60,7 +60,7 @@ def dependency_check(ftests, feature_dir):
                         print(f"Warning:  {reason_info}")
 
 # Read the tests file and create Runnable objects.
-def create_runnables_from_file(ftests, feature_dir):
+def create_runnables_from_file(ftests):
     tests = []
     with open(ftests, 'r') as file:
         for line in file:
@@ -75,10 +75,13 @@ def create_runnables_from_file(ftests, feature_dir):
     return tests
 
 def main():
+    # Get the absolute directory of the tests file.
+    tests_abs = os.path.abspath(args.tests)
+
     # Check the dependency and create Runnable objects.
-    dependency_check(args.tests, args.feature)
-    os.chdir(f'{BM_dir}/{args.feature}')
-    tests = create_runnables_from_file("../"+args.tests, args.feature)
+    os.chdir(f"{BM_dir}/{args.feature}")
+    dependency_check(tests_abs)
+    tests = create_runnables_from_file(tests_abs)
 
     # Create a test suite and add tests.
     suite = TestSuite(name="lkvs-test", tests=tests)

diff --git a/scenario/emr-oe/tests-pmu b/scenario/emr-oe/tests-pmu
@@ -1,6 +1,6 @@
 # This file collects the basic Performance Monitoring Unit(PMU) cases on Intel® Architecture-based platforms.
 # @hw_dep:
-# @other_dep: yum install perf
+# @other_dep: which perf @no perf tool, please install perf
 # @other_warn: Disable watchdog when running with vPMU. $echo 0 > /proc/sys/kernel/nmi_watchdog
 pmu_tests.sh -t benchmark -w 0
 pmu_tests.sh -t benchmark -w 1