Commit 0a3f60fa authored by Paweł Hajdan, Jr's avatar Paweł Hajdan, Jr

Use src-side launchers for telemetry and nacl integration tests everywhere

BUG=422235
R=sergiyb@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#302609}
parent 30ec995c
...@@ -49,6 +49,20 @@ ...@@ -49,6 +49,20 @@
"mojo_surfaces_lib_unittests", "mojo_surfaces_lib_unittests",
"mojo_system_unittests", "mojo_system_unittests",
"nacl_loader_unittests" "nacl_loader_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux Trusty (dbg)": { "Linux Trusty (dbg)": {
...@@ -101,6 +115,20 @@ ...@@ -101,6 +115,20 @@
"mojo_surfaces_lib_unittests", "mojo_surfaces_lib_unittests",
"mojo_system_unittests", "mojo_system_unittests",
"nacl_loader_unittests" "nacl_loader_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux Trusty (32)": { "Linux Trusty (32)": {
...@@ -153,6 +181,20 @@ ...@@ -153,6 +181,20 @@
"mojo_surfaces_lib_unittests", "mojo_surfaces_lib_unittests",
"mojo_system_unittests", "mojo_system_unittests",
"nacl_loader_unittests" "nacl_loader_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux Trusty (dbg)(32)": { "Linux Trusty (dbg)(32)": {
...@@ -205,6 +247,20 @@ ...@@ -205,6 +247,20 @@
"mojo_surfaces_lib_unittests", "mojo_surfaces_lib_unittests",
"mojo_system_unittests", "mojo_system_unittests",
"nacl_loader_unittests" "nacl_loader_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux ARM Cross-Compile": { "Linux ARM Cross-Compile": {
...@@ -256,6 +312,20 @@ ...@@ -256,6 +312,20 @@
"unit_tests", "unit_tests",
"url_unittests", "url_unittests",
"browser_tests" "browser_tests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux ChromiumOS Athena Tests (1)": { "Linux ChromiumOS Athena Tests (1)": {
......
...@@ -201,6 +201,12 @@ ...@@ -201,6 +201,12 @@
"url_unittests", "url_unittests",
"views_unittests", "views_unittests",
"wm_unittests" "wm_unittests"
],
"scripts": [
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux Tests (dbg)(1)": { "Linux Tests (dbg)(1)": {
...@@ -300,6 +306,20 @@ ...@@ -300,6 +306,20 @@
"url_unittests", "url_unittests",
"views_unittests", "views_unittests",
"wm_unittests" "wm_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Linux Clang (dbg)": { "Linux Clang (dbg)": {
......
...@@ -81,6 +81,20 @@ ...@@ -81,6 +81,20 @@
} }
}, },
"url_unittests" "url_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Mac10.7 Tests (1)": { "Mac10.7 Tests (1)": {
...@@ -167,6 +181,14 @@ ...@@ -167,6 +181,14 @@
"url_unittests" "url_unittests"
], ],
"scripts": [ "scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{ {
"name": "nacl_integration", "name": "nacl_integration",
"script": "nacl_integration.py" "script": "nacl_integration.py"
...@@ -255,6 +277,20 @@ ...@@ -255,6 +277,20 @@
} }
}, },
"url_unittests" "url_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Mac 10.7 Tests (dbg)(1)": { "Mac 10.7 Tests (dbg)(1)": {
...@@ -340,6 +376,20 @@ ...@@ -340,6 +376,20 @@
} }
}, },
"url_unittests" "url_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
} }
} }
...@@ -86,6 +86,20 @@ ...@@ -86,6 +86,20 @@
"url_unittests", "url_unittests",
"views_unittests", "views_unittests",
"wm_unittests" "wm_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{
"name": "nacl_integration",
"script": "nacl_integration.py"
}
] ]
}, },
"Vista Tests (1)": { "Vista Tests (1)": {
...@@ -181,6 +195,16 @@ ...@@ -181,6 +195,16 @@
"url_unittests", "url_unittests",
"views_unittests", "views_unittests",
"wm_unittests" "wm_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
}
] ]
}, },
"Win7 Tests (1)": { "Win7 Tests (1)": {
...@@ -284,6 +308,14 @@ ...@@ -284,6 +308,14 @@
"wm_unittests" "wm_unittests"
], ],
"scripts": [ "scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
},
{ {
"name": "nacl_integration", "name": "nacl_integration",
"script": "nacl_integration.py" "script": "nacl_integration.py"
...@@ -382,6 +414,10 @@ ...@@ -382,6 +414,10 @@
"wm_unittests" "wm_unittests"
], ],
"scripts": [ "scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{ {
"name": "nacl_integration", "name": "nacl_integration",
"script": "nacl_integration.py" "script": "nacl_integration.py"
...@@ -487,6 +523,16 @@ ...@@ -487,6 +523,16 @@
"url_unittests", "url_unittests",
"views_unittests", "views_unittests",
"wm_unittests" "wm_unittests"
],
"scripts": [
{
"name": "telemetry_unittests",
"script": "telemetry_unittests.py"
},
{
"name": "telemetry_perf_unittests",
"script": "telemetry_perf_unittests.py"
}
] ]
}, },
"Win8 Aura": { "Win8 Aura": {
......
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