diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/content_tests.gypi | 13 | ||||
| -rw-r--r-- | content/telemetry.isolate | 34 | ||||
| -rw-r--r-- | content/telemetry_gpu_unittests.isolate | 28 | ||||
| -rwxr-xr-x | content/test/gpu/run_gpu_test.py | 5 | ||||
| -rwxr-xr-x | content/test/gpu/run_unittests.py | 10 |
5 files changed, 79 insertions, 11 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 41bae65..7876515 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -1271,6 +1271,19 @@ '../tools/telemetry/telemetry.gyp:bitmaptools#host', ], }, + { + 'target_name': 'telemetry_gpu_unittests_run', + 'type': 'none', + 'dependencies': [ + 'telemetry_base', + ], + 'includes': [ + '../build/isolate.gypi', + ], + 'sources': [ + 'telemetry_gpu_unittests.isolate', + ], + }, ], 'conditions': [ ['archive_gpu_tests==1', { diff --git a/content/telemetry.isolate b/content/telemetry.isolate new file mode 100644 index 0000000..4679a5e --- /dev/null +++ b/content/telemetry.isolate @@ -0,0 +1,34 @@ +# Copyright (c) 2015 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. +{ + 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + # This list comes from running: + # tools/perf/run_benchmark --print-bootstrap-deps + # and filtering out obvious undesired dependencies: + # 'src/tools/perf/page_sets/' + # 'src/tools/perf/measurements/' + # 'src/tools/perf/metrics/' + # 'src/tools/perf/profile_creators/' + # 'src/tools/perf/benchmarks/' + # 'src/chrome/test/data/extensions/profiles/' + # Note that the dependency on ../build/android/ was made more + # precise to ../build/android/pylib/. + '../build/android/pylib/', + '../build/android/devil/', + '../build/util/', + '../third_party/WebKit/PerformanceTests/resources/jquery.tablesorter.min.js', + '../third_party/WebKit/PerformanceTests/resources/statistics.js', + '../third_party/flot/jquery.flot.min.js', + '../third_party/webpagereplay/', + '../tools/telemetry/', + # For Telemetry's screenshot support. + '<(PRODUCT_DIR)/bitmaptools<(EXECUTABLE_SUFFIX)', + ], + }, + }], + ] +} diff --git a/content/telemetry_gpu_unittests.isolate b/content/telemetry_gpu_unittests.isolate new file mode 100644 index 0000000..9e70eb3 --- /dev/null +++ b/content/telemetry_gpu_unittests.isolate @@ -0,0 +1,28 @@ +# Copyright (c) 2015 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. +{ + 'includes': [ + 'telemetry.isolate', + ], + 'conditions': [ + ['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', { + 'variables': { + 'files': [ + # Other dependencies of the tests and their harness. + '../third_party/typ/', + '../third_party/catapult/', + '../testing/scripts/common.py', + '../testing/scripts/run_telemetry_as_googletest.py', + # The following represent the actual tests. + '../content/test/gpu/', + ], + 'command': [ + '../testing/scripts/run_telemetry_as_googletest.py', + '../content/test/gpu/run_unittests.py', + '-v', + ], + }, + }], + ] +} diff --git a/content/test/gpu/run_gpu_test.py b/content/test/gpu/run_gpu_test.py index 00091d6..e51a2b2 100755 --- a/content/test/gpu/run_gpu_test.py +++ b/content/test/gpu/run_gpu_test.py @@ -87,10 +87,7 @@ if __name__ == '__main__': top_level_dir = os.path.dirname(os.path.realpath(__file__)) config = benchmark_runner.ProjectConfig( top_level_dir=top_level_dir, - benchmark_dirs=[os.path.join(top_level_dir, 'gpu_tests')], - client_config=os.path.abspath(os.path.join( - top_level_dir, os.pardir, os.pardir, os.pardir, 'tools', 'perf', - 'core', 'binary_dependencies.json'))) + benchmark_dirs=[os.path.join(top_level_dir, 'gpu_tests')]) did_launch_dbus = _LaunchDBus() try: diff --git a/content/test/gpu/run_unittests.py b/content/test/gpu/run_unittests.py index f74b1ea..11eb514 100755 --- a/content/test/gpu/run_unittests.py +++ b/content/test/gpu/run_unittests.py @@ -24,11 +24,7 @@ if __name__ == '__main__': else: env['PYTHONPATH'] = telemetry_dir - path_to_run_tests = os.path.realpath(os.path.join( - telemetry_dir, 'telemetry', 'testing', 'run_tests.py')) - client_config = os.path.realpath(os.path.join( - gpu_test_dir, os.pardir, os.pardir, os.pardir, 'tools', 'perf', - 'core', 'binary_dependencies.json')) - argv = ['--no-browser', '--top-level-dir', gpu_test_dir, - '--client-config', client_config] + sys.argv[1:] + path_to_run_tests = os.path.join(telemetry_dir, 'telemetry', 'testing', + 'run_tests.py') + argv = ['--no-browser', '--top-level-dir', gpu_test_dir] + sys.argv[1:] sys.exit(subprocess.call([sys.executable, path_to_run_tests] + argv, env=env)) |