diff options
author | murgatroid99 <mlumish@google.com> | 2017-01-04 15:43:02 -0800 |
---|---|---|
committer | murgatroid99 <mlumish@google.com> | 2017-01-04 15:43:02 -0800 |
commit | c34cac28912595814fb35225957eed0ddfd5d610 (patch) | |
tree | 5b89408b87d756791e6c5dee2247bae3609565cc /tools/run_tests/task_runner.py | |
parent | 804c9e90fc4e7d11294fec69801ff7bc99134d3c (diff) | |
parent | 360f5d2abf8cb0f92aeeb3a1b201d2eb3bd13374 (diff) |
Merge branch 'master' into node_electron_build
Diffstat (limited to 'tools/run_tests/task_runner.py')
-rwxr-xr-x | tools/run_tests/task_runner.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tools/run_tests/task_runner.py b/tools/run_tests/task_runner.py index 2e3fa443b9..fdc4668222 100755 --- a/tools/run_tests/task_runner.py +++ b/tools/run_tests/task_runner.py @@ -33,14 +33,13 @@ from __future__ import print_function import argparse -import atexit -import jobset import multiprocessing import sys -import artifact_targets -import distribtest_targets -import package_targets +import artifacts.artifact_targets as artifact_targets +import artifacts.distribtest_targets as distribtest_targets +import artifacts.package_targets as package_targets +import python_utils.jobset as jobset _TARGETS = [] _TARGETS += artifact_targets.targets() |