diff --git a/tools/runners/run-test-suite-test262.py b/tools/runners/run-test-suite-test262.py index 020b6548e..fb5e9979d 100755 --- a/tools/runners/run-test-suite-test262.py +++ b/tools/runners/run-test-suite-test262.py @@ -173,12 +173,6 @@ def main(args): util.set_timezone('Pacific Standard Time') command = (args.runtime + ' ' + args.engine).strip() - if args.es2015 or args.esnext: - try: - subprocess.check_output(["timeout", "--version"]) - command = "timeout 5 " + command - except subprocess.CalledProcessError: - pass kwargs = {} if sys.version_info.major >= 3: diff --git a/tools/runners/test262-harness.py b/tools/runners/test262-harness.py index ee6072c3f..f2a36d7ab 100755 --- a/tools/runners/test262-harness.py +++ b/tools/runners/test262-harness.py @@ -55,6 +55,7 @@ import xml.dom.minidom from collections import Counter import signal +import threading import multiprocessing ####################################################################### @@ -65,6 +66,10 @@ M_YAML_LIST_PATTERN = re.compile(r"^\[(.*)\]$") M_YAML_MULTILINE_LIST = re.compile(r"^ *- (.*)$") +# The timeout of each test case +TEST262_CASE_TIMEOUT = 5 + + def yaml_load(string): return my_read_dict(string.splitlines())[1] @@ -595,11 +600,14 @@ class TestCase(object): logging.info("exec: %s", str(args)) process = subprocess.Popen( args, - shell=is_windows(), + shell=False, stdout=stdout.file_desc, stderr=stderr.file_desc ) + timer = threading.Timer(TEST262_CASE_TIMEOUT, process.kill) + timer.start() code = process.wait() + timer.cancel() out = stdout.read() err = stderr.read() finally: