diff --git a/.travis.yml b/.travis.yml index 27f7c3ea4e..8ce9861ff4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,6 @@ matrix: - env: - JOBNAME="Conformance Tests" - OPTS="--test262" - - TZ=America/Los_Angeles - env: - JOBNAME="ASAN Tests" diff --git a/tools/run-tests.py b/tools/run-tests.py index be2469ca07..c8f8101542 100755 --- a/tools/run-tests.py +++ b/tools/run-tests.py @@ -199,8 +199,11 @@ def get_arguments(): TERM_NORMAL = '\033[0m' TERM_BLUE = '\033[1;34m' -def report_command(cmd_type, cmd): +def report_command(cmd_type, cmd, env=None): sys.stderr.write('%s%s%s\n' % (TERM_BLUE, cmd_type, TERM_NORMAL)) + if env is not None: + sys.stderr.write(''.join('%s%s=%r \\%s\n' % (TERM_BLUE, var, val, TERM_NORMAL) + for var, val in sorted(env.items()))) sys.stderr.write('%s%s%s\n' % (TERM_BLUE, (' \\%s\n\t%s' % (TERM_NORMAL, TERM_BLUE)).join(cmd), TERM_NORMAL)) def create_binary(job, options): @@ -279,15 +282,17 @@ def iterate_test_runner_jobs(jobs, options): yield job, ret_build, test_cmd -def run_check(runnable): - report_command('Test command:', runnable) +def run_check(runnable, env=None): + report_command('Test command:', runnable, env=env) - try: - ret = subprocess.check_call(runnable) - except subprocess.CalledProcessError as err: - return err.returncode + if env is not None: + full_env = dict(os.environ) + full_env.update(env) + env = full_env - return ret + proc = subprocess.Popen(runnable, env=env) + proc.wait() + return proc.returncode def run_jerry_debugger_tests(options): ret_build = ret_test = 0 @@ -341,7 +346,7 @@ def run_jerry_tests(options): if job.test_args: test_cmd.extend(job.test_args) - ret_test |= run_check(test_cmd) + ret_test |= run_check(test_cmd, env=dict(TZ='UTC')) return ret_build | ret_test @@ -387,7 +392,7 @@ def run_test262_test_suite(options): if job.test_args: test_cmd.extend(job.test_args) - ret_test |= run_check(test_cmd) + ret_test |= run_check(test_cmd, env=dict(TZ='America/Los_Angeles')) return ret_build | ret_test