From 114b156d74dc4124bd721a3addd00c06e6d4f4b8 Mon Sep 17 00:00:00 2001 From: Paul Gauthier Date: Thu, 19 Dec 2024 15:56:16 -0800 Subject: [PATCH] fix: Use relative paths for ignored files, remove redundant try --- benchmark/benchmark.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/benchmark/benchmark.py b/benchmark/benchmark.py index c37d1eefc..027cfef66 100755 --- a/benchmark/benchmark.py +++ b/benchmark/benchmark.py @@ -674,8 +674,8 @@ def run_test_real( ) # Add all files under .meta and .docs directories - ignore_files.update(str(p) for p in testdir.glob(".meta/**/*")) - ignore_files.update(str(p) for p in testdir.glob(".docs/**/*")) + ignore_files.update(str(p.relative_to(testdir)) for p in testdir.glob(".meta/**/*")) + ignore_files.update(str(p.relative_to(testdir)) for p in testdir.glob(".docs/**/*")) # Also ignore test & example files ignore_files.update(test_files) @@ -817,11 +817,11 @@ def run_test_real( try: errors = run_unit_tests(original_dname, testdir, history_fname, test_files) except subprocess.TimeoutExpired: - try: - errors = run_unit_tests(original_dname, testdir, history_fname, test_files) - except subprocess.TimeoutExpired: - errors = "Tests timed out!" - timeouts += 1 + #try: + # errors = run_unit_tests(original_dname, testdir, history_fname, test_files) + #except subprocess.TimeoutExpired: + errors = "Tests timed out!" + timeouts += 1 if errors: test_outcomes.append(False)