summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtools/perf/run_tests5
-rwxr-xr-xtools/telemetry/run_tests5
2 files changed, 6 insertions, 4 deletions
diff --git a/tools/perf/run_tests b/tools/perf/run_tests
index 45761f6..77a5366 100755
--- a/tools/perf/run_tests
+++ b/tools/perf/run_tests
@@ -2,6 +2,7 @@
# Copyright 2013 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+
"""This script runs unit tests of the code in the perf directory.
This script DOES NOT run benchmarks. run_benchmarks and run_measurement do that.
@@ -10,11 +11,11 @@ This script DOES NOT run benchmarks. run_benchmarks and run_measurement do that.
import os
import sys
-import measurements
-import perf_tools
+sys.path.append(os.path.join(os.path.dirname(__file__), os.pardir, 'telemetry'))
from telemetry.unittest import gtest_testrunner
from telemetry.unittest import run_tests
+
if __name__ == '__main__':
top_level_dir = os.path.abspath(os.path.dirname(__file__))
runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False)
diff --git a/tools/telemetry/run_tests b/tools/telemetry/run_tests
index d02a0a7..e5c13e9 100755
--- a/tools/telemetry/run_tests
+++ b/tools/telemetry/run_tests
@@ -2,17 +2,18 @@
# Copyright (c) 2012 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+
import os
import sys
from telemetry.unittest import gtest_testrunner
from telemetry.unittest import run_tests
+
if __name__ == '__main__':
top_level_dir = os.path.abspath(os.path.dirname(__file__))
runner = gtest_testrunner.GTestTestRunner(print_result_after_run=False)
- start_dir = os.path.join(top_level_dir, 'telemetry')
- ret = run_tests.Main(sys.argv[1:], start_dir, top_level_dir, runner)
+ ret = run_tests.Main(sys.argv[1:], top_level_dir, top_level_dir, runner)
if runner.result:
runner.result.PrintSummary()