diff --git a/test262/run_sunspider.py b/test262/run_sunspider.py index cb59b4f5085a0ea174c7e13c3ded34821a3c3e6b..4a2e0d26c2beaff809be19f605fed7dd07a6316f 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 d8f05aa9929ded0f96eef0868b10dc5d781540d0..4c51f40d7187587998fb4fc57f82a4e68a67c363 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()