Index: content/test/gpu/run_unittests |
diff --git a/content/test/gpu/run_unittests b/content/test/gpu/run_unittests |
index 781a07356258f1ae19698a627ef973c11dc7ad5d..ad8abfcb7cc4857a3a76fe6c77ba056cb165e03b 100755 |
--- a/content/test/gpu/run_unittests |
+++ b/content/test/gpu/run_unittests |
@@ -15,10 +15,17 @@ |
sys.path.append(os.path.join(os.path.dirname(__file__), |
os.pardir, os.pardir, os.pardir, 'tools', 'telemetry')) |
+from telemetry.unittest import gtest_testrunner |
from telemetry.unittest import run_tests |
if __name__ == '__main__': |
- base_dir = os.path.dirname(os.path.realpath(__file__)) |
- run_tests.environment = run_tests.Environment(base_dir, [base_dir]) |
- sys.exit(run_tests.RunTestsCommand.main()) |
+ top_level_dir = os.path.abspath(os.path.dirname(__file__)) |
+ runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False) |
+ ret = run_tests.Main(sys.argv[1:], top_level_dir, top_level_dir, runner) |
+ |
+ if runner.result: |
+ runner.result.PrintSummary() |
+ sys.exit(min(ret + runner.result.num_errors, 255)) |
+ else: |
+ sys.exit(ret) |