summaryrefslogtreecommitdiffstats
path: root/tools/telemetry/run_tests
diff options
context:
space:
mode:
authorxusydoc@chromium.org <xusydoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 19:27:05 +0000
committerxusydoc@chromium.org <xusydoc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 19:27:05 +0000
commit24abb71c8c9f362af6a04aed192e7214f25c3330 (patch)
tree11fd9ba04d7f686bb3df84e76e88b15e720ed187 /tools/telemetry/run_tests
parent284b46d4be13d5f0e4b5cabbc80711b51c7af2d6 (diff)
downloadchromium_src-24abb71c8c9f362af6a04aed192e7214f25c3330.zip
chromium_src-24abb71c8c9f362af6a04aed192e7214f25c3330.tar.gz
chromium_src-24abb71c8c9f362af6a04aed192e7214f25c3330.tar.bz2
Convert telemetry unittests to output in GTest format.
This also corrects an issue where failing tests were incorrectly reported as passing. BUG=156398 Review URL: https://chromiumcodereview.appspot.com/12090102 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/telemetry/run_tests')
-rwxr-xr-xtools/telemetry/run_tests10
1 files changed, 8 insertions, 2 deletions
diff --git a/tools/telemetry/run_tests b/tools/telemetry/run_tests
index 43a9ec2..3fbadde 100755
--- a/tools/telemetry/run_tests
+++ b/tools/telemetry/run_tests
@@ -5,12 +5,18 @@
import os
import sys
+import telemetry.gtest_testrunner
import telemetry.run_tests
if __name__ == '__main__':
top_level_dir = os.path.abspath(
os.path.dirname(__file__))
+ runner = telemetry.gtest_testrunner.GTestTestRunner(
+ print_result_after_run=False)
start_dir = 'telemetry'
ret = telemetry.run_tests.Main(
- sys.argv[1:], start_dir, top_level_dir)
- sys.exit(ret)
+ sys.argv[1:], start_dir, top_level_dir, runner)
+
+ runner.result.PrintSummary()
+
+ sys.exit(max(ret + runner.result.num_errors, 255))