From 404158bde33ce5a5424c1c1d12ad8c8fea03234a Mon Sep 17 00:00:00 2001 From: SivaLee Date: Thu, 30 Jun 2022 15:32:47 +0800 Subject: [PATCH] Fixed skip error: some js cases should be skipped when test262 runs normally Signed-off-by: SivaLee Change-Id: I946d03e3dc45a1a5d30f83c9f99908d1a2cefe1e --- test262/run_sunspider.py | 5 ++++- test262/run_test262.py | 11 +++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/test262/run_sunspider.py b/test262/run_sunspider.py index cb59b4f508..4a2e0d26c2 100755 --- a/test262/run_sunspider.py +++ b/test262/run_sunspider.py @@ -189,7 +189,10 @@ class ArkProgram(): def execute(self): if platform.system() == "Windows" : - os.environ["PATH"] = self.libs_dir + ";" + os.environ["PATH"] + #add env path for cmd/powershell execute + libs_dir = self.libs_dir.replace(":", ";") + libs_dir = libs_dir.replace("/", "\\") + os.environ["PATH"] = libs_dir + ";" + os.environ["PATH"] elif platform.system() == "Linux" : os.environ["LD_LIBRARY_PATH"] = self.libs_dir else : diff --git a/test262/run_test262.py b/test262/run_test262.py index d8f05aa992..4c51f40d71 100755 --- a/test262/run_test262.py +++ b/test262/run_test262.py @@ -267,12 +267,14 @@ class TestPrepare(): else: self.args.dir = os.path.join(DATA_DIR, "test") - def copyfile(self, file): + def copyfile(self, file, all_skips, intl_skips): dstdir = os.path.join(DATA_DIR, "test") file = file.strip() - if file in ALL_SKIP_TESTS: + file = file.strip('\n') + file = file.replace("\\", "/") + if file in all_skips: return - if file in INTL_SKIP_TESTS: + if file in intl_skips: return srcdir = os.path.join(DATA_DIR, "test", file) @@ -364,7 +366,8 @@ class TestPrepare(): mkdir(path) pool = Pool(DEFAULT_THREADS) - pool.map(self.copyfile, files) + for it in files: + pool.apply(self.copyfile, (it, ALL_SKIP_TESTS, INTL_SKIP_TESTS)) pool.close() pool.join() -- Gitee