From 3dbf421e05739d7e302a18460dd3a03c5af5dae0 Mon Sep 17 00:00:00 2001 From: ghangz <152254226+ghangz@users.noreply.github.com> Date: Wed, 1 Jul 2026 11:43:24 +0800 Subject: [PATCH 1/2] Resolve benchmark testall paths from script dir --- benchmark/testall.py | 11 ++++++----- unit_test/test_benchmark_testall_paths.py | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 unit_test/test_benchmark_testall_paths.py diff --git a/benchmark/testall.py b/benchmark/testall.py index 8b0e7ab..91050b5 100644 --- a/benchmark/testall.py +++ b/benchmark/testall.py @@ -4,12 +4,13 @@ import time # ================= 配置路径与规则 ================= -CONFIG_DIR = "config" -RUNNERS_DIR = "runners" -TARGET_SCRIPT = "mcoplib_mxbenchmark_ops.py" -OUTPUT_FILE = "teslalloutput.txt" +SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) +CONFIG_DIR = os.path.join(SCRIPT_DIR, "config") +RUNNERS_DIR = os.path.join(SCRIPT_DIR, "runners") +TARGET_SCRIPT = os.path.join(SCRIPT_DIR, "mcoplib_mxbenchmark_ops.py") +OUTPUT_FILE = os.path.join(SCRIPT_DIR, "teslalloutput.txt") -STATISTICS_DIR = "statistics" +STATISTICS_DIR = os.path.join(SCRIPT_DIR, "statistics") CSV_FILENAME = "mcoplib_ops_performance_C500.csv" CSV_SAVE_PATH = os.path.join(STATISTICS_DIR, CSV_FILENAME) diff --git a/unit_test/test_benchmark_testall_paths.py b/unit_test/test_benchmark_testall_paths.py new file mode 100644 index 0000000..5027fa8 --- /dev/null +++ b/unit_test/test_benchmark_testall_paths.py @@ -0,0 +1,19 @@ +import os +from pathlib import Path + +from benchmark import testall + + +def test_testall_paths_are_script_relative(): + script_dir = Path(testall.__file__).resolve().parent + + for path in ( + testall.CONFIG_DIR, + testall.RUNNERS_DIR, + testall.TARGET_SCRIPT, + testall.OUTPUT_FILE, + testall.STATISTICS_DIR, + testall.CSV_SAVE_PATH, + ): + assert os.path.isabs(path) + assert Path(path).resolve().is_relative_to(script_dir) From e44ecb57a278e749d8a60dd3d0f5ca9a9915ce23 Mon Sep 17 00:00:00 2001 From: ghangz <152254226+ghangz@users.noreply.github.com> Date: Wed, 1 Jul 2026 15:45:37 +0800 Subject: [PATCH 2/2] Fix testall output path compatibility --- benchmark/testall.py | 2 +- unit_test/test_benchmark_testall_paths.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/benchmark/testall.py b/benchmark/testall.py index 91050b5..ae6f901 100644 --- a/benchmark/testall.py +++ b/benchmark/testall.py @@ -8,7 +8,7 @@ CONFIG_DIR = os.path.join(SCRIPT_DIR, "config") RUNNERS_DIR = os.path.join(SCRIPT_DIR, "runners") TARGET_SCRIPT = os.path.join(SCRIPT_DIR, "mcoplib_mxbenchmark_ops.py") -OUTPUT_FILE = os.path.join(SCRIPT_DIR, "teslalloutput.txt") +OUTPUT_FILE = os.path.join(SCRIPT_DIR, "testalloutput.txt") STATISTICS_DIR = os.path.join(SCRIPT_DIR, "statistics") CSV_FILENAME = "mcoplib_ops_performance_C500.csv" diff --git a/unit_test/test_benchmark_testall_paths.py b/unit_test/test_benchmark_testall_paths.py index 5027fa8..c613843 100644 --- a/unit_test/test_benchmark_testall_paths.py +++ b/unit_test/test_benchmark_testall_paths.py @@ -16,4 +16,5 @@ def test_testall_paths_are_script_relative(): testall.CSV_SAVE_PATH, ): assert os.path.isabs(path) - assert Path(path).resolve().is_relative_to(script_dir) + resolved = Path(path).resolve() + assert resolved == script_dir or script_dir in resolved.parents