diff options
author | nednguyen <nednguyen@google.com> | 2015-11-18 07:52:46 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 15:54:23 +0000 |
commit | 8365ba55e91e8e82a3c47ea997f5ba940a880be5 (patch) | |
tree | 7cc85f561af9660ca0061586e12bb0854b1f2efe /testing | |
parent | ce24c28c3bf8f683bf6eb086e5d3802b7630a249 (diff) | |
download | chromium_src-8365ba55e91e8e82a3c47ea997f5ba940a880be5.zip chromium_src-8365ba55e91e8e82a3c47ea997f5ba940a880be5.tar.gz chromium_src-8365ba55e91e8e82a3c47ea997f5ba940a880be5.tar.bz2 |
Isolate + swarm telemetry_unittest on all platforms
@dtu for changes to tools/telemetry/telemetry/internal/util/find_dependencies.py
& bootstrap_deps files.
These changes are due to the fact that boot_strap module in telemetry
making assumption about chromium directory containing "src/"
folder which isn't true in the context of isolated testing.
Since telemetry_dependencies_unittest.py uses find_dependencies
for checking that telemetry doesn't contain extra python
module deps, those changes are included to make
telemetry_unittests passing.
BUG=507796
Review URL: https://codereview.chromium.org/1423033010
Cr-Commit-Position: refs/heads/master@{#360336}
Diffstat (limited to 'testing')
-rw-r--r-- | testing/buildbot/chromium.fyi.json | 98 | ||||
-rw-r--r-- | testing/buildbot/chromium.linux.json | 28 | ||||
-rw-r--r-- | testing/buildbot/chromium.mac.json | 70 | ||||
-rw-r--r-- | testing/buildbot/chromium.win.json | 44 | ||||
-rw-r--r-- | testing/buildbot/gn_isolate_map.pyl | 12 | ||||
-rwxr-xr-x | testing/buildbot/manage.py | 1 |
6 files changed, 181 insertions, 72 deletions
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json index d1ed40c..ee56ed6 100644 --- a/testing/buildbot/chromium.fyi.json +++ b/testing/buildbot/chromium.fyi.json @@ -607,14 +607,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1540,14 +1546,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1760,14 +1772,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -4861,14 +4879,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -5065,14 +5089,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -5374,14 +5404,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -5566,14 +5602,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json index ed24041..a1959fe 100644 --- a/testing/buildbot/chromium.linux.json +++ b/testing/buildbot/chromium.linux.json @@ -689,6 +689,16 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ @@ -705,10 +715,6 @@ "script": "checkperms.py" }, { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" }, @@ -1067,14 +1073,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } diff --git a/testing/buildbot/chromium.mac.json b/testing/buildbot/chromium.mac.json index 2da7a3f..7c13bcf 100644 --- a/testing/buildbot/chromium.mac.json +++ b/testing/buildbot/chromium.mac.json @@ -334,14 +334,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -635,14 +641,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -936,14 +948,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1237,14 +1255,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1539,14 +1563,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } diff --git a/testing/buildbot/chromium.win.json b/testing/buildbot/chromium.win.json index cc97231..bd9753e 100644 --- a/testing/buildbot/chromium.win.json +++ b/testing/buildbot/chromium.win.json @@ -706,14 +706,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1160,14 +1166,20 @@ "swarming": { "can_use_on_swarming_builders": true } + }, + { + "isolate_name": "telemetry_unittests", + "name": "telemetry_unittests", + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "nacl_integration", "script": "nacl_integration.py" } @@ -1518,12 +1530,16 @@ "swarming": { "can_use_on_swarming_builders": true } - } - ], - "scripts": [ + }, { + "isolate_name": "telemetry_unittests", "name": "telemetry_unittests", - "script": "telemetry_unittests.py" + "override_compile_targets": [ + "telemetry_unittests_run" + ], + "swarming": { + "can_use_on_swarming_builders": true + } } ] }, @@ -2005,10 +2021,6 @@ ], "scripts": [ { - "name": "telemetry_unittests", - "script": "telemetry_unittests.py" - }, - { "name": "telemetry_perf_unittests", "script": "telemetry_perf_unittests.py" }, diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl index 0cf89ab..07fa7f6 100644 --- a/testing/buildbot/gn_isolate_map.pyl +++ b/testing/buildbot/gn_isolate_map.pyl @@ -411,6 +411,18 @@ "-v", ], }, + "telemetry_unittests": { + "label": "//chrome/test:telemetry_unittests", + "type": "script", + "script": "//testing/scripts/run_telemetry_as_googletest.py", + "args": [ + "--xvfb", + "../../tools/telemetry/run_tests", + "-v", + "--chrome-root", + "../../", + ], + }, "ui_android_unittests": { "label": "//ui/android:ui_android_unittests", "type": "console_test_launcher", diff --git a/testing/buildbot/manage.py b/testing/buildbot/manage.py index 8a3924ef..3c51341 100755 --- a/testing/buildbot/manage.py +++ b/testing/buildbot/manage.py @@ -76,6 +76,7 @@ SKIP_GN_ISOLATE_MAP_TARGETS = { 'telemetry_gpu_test', 'telemetry_gpu_unittests', 'telemetry_perf_unittests', + 'telemetry_unittests', } |