Commit 6c28e304 authored by nednguyen's avatar nednguyen Committed by Commit bot

Run telemetry_gpu_unittests via isolate on "Windows Tests" & "Mac tests" and trybot.

BUG=507796

Review URL: https://codereview.chromium.org/1396313005

Cr-Commit-Position: refs/heads/master@{#353931}
parent a5a4e4ab
......@@ -3187,6 +3187,19 @@
}],
],
},
{
'target_name': 'telemetry_gpu_unittests',
'type': 'none',
'dependencies': [
'../content/content_shell_and_tests.gyp:telemetry_base',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'telemetry_gpu_unittests.isolate',
],
},
{
'target_name': 'chromedriver_unittests_run',
'type': 'none',
......@@ -3269,19 +3282,6 @@
],
},
},
{
'target_name': 'telemetry_gpu_unittests_run',
'type': 'none',
'dependencies': [
'../content/content_shell_and_tests.gyp:telemetry_base',
],
'includes': [
'../build/isolate.gypi',
],
'sources': [
'telemetry_gpu_unittests.isolate',
],
},
{
'target_name': 'telemetry_chrome_test_base',
'type': 'none',
......
......@@ -12,6 +12,8 @@
# Other dependencies of the tests and their harness.
'../third_party/typ/',
'../third_party/catapult/',
'../testing/test_env.py',
'../testing/xvfb.py',
'../testing/scripts/common.py',
'../testing/scripts/run_telemetry_as_googletest.py',
# The following represent the actual tests.
......
......@@ -499,15 +499,17 @@
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1249,15 +1251,17 @@
"test": "wtf_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1455,15 +1459,17 @@
"test": "wtf_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -4518,15 +4524,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -4708,15 +4716,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -5003,15 +5013,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -5181,15 +5193,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......
......@@ -307,15 +307,17 @@
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -588,15 +590,17 @@
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -869,15 +873,17 @@
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1150,15 +1156,17 @@
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1432,15 +1440,17 @@
"test": "url_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......
......@@ -680,15 +680,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1113,15 +1115,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1451,15 +1455,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......@@ -1977,15 +1983,17 @@
"test": "wm_unittests"
}
],
"isolated_scripts": [
{
"isolate_name": "telemetry_gpu_unittests",
"name": "telemetry_gpu_unittests"
}
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_gpu_unittests",
"script": "telemetry_gpu_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment