Commit 8824ed5b authored by simonhatch's avatar simonhatch Committed by Commit bot

Revert of Disable gpu_perftests on android. (patchset #1 id:1 of...

Revert of Disable gpu_perftests on android. (patchset #1 id:1 of https://codereview.chromium.org/1014573007/)

Reason for revert:
Fixed already!

Original issue's description:
> Disable gpu_perftests on android.
>
> Failing on Nexus 4/5/7v2 and MotoE.
>
> TBR=dcastagna
> BUG=464373
>
> Committed: https://crrev.com/cbcf11d9fa9fd06dd81dd3faf7f69a0e8f54e54f
> Cr-Commit-Position: refs/heads/master@{#321367}

TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=464373

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

Cr-Commit-Position: refs/heads/master@{#321379}
parent dfd141b0
...@@ -13,6 +13,11 @@ ...@@ -13,6 +13,11 @@
{ {
"name": "host_info", "name": "host_info",
"script": "host_info.py" "script": "host_info.py"
},
{
"name": "gpu_perftests",
"script": "gtest_perf_test.py",
"args": ["gpu_perftests"]
} }
] ]
}, },
...@@ -21,11 +26,21 @@ ...@@ -21,11 +26,21 @@
{ {
"name": "host_info", "name": "host_info",
"script": "host_info.py" "script": "host_info.py"
},
{
"name": "gpu_perftests",
"script": "gtest_perf_test.py",
"args": ["gpu_perftests"]
} }
] ]
}, },
"Android Nexus6 Perf": { "Android Nexus6 Perf": {
"scripts": [ "scripts": [
{
"name": "gpu_perftests",
"script": "gtest_perf_test.py",
"args": ["gpu_perftests"]
}
] ]
}, },
"Android Nexus7v2 Perf": { "Android Nexus7v2 Perf": {
...@@ -33,6 +48,11 @@ ...@@ -33,6 +48,11 @@
{ {
"name": "host_info", "name": "host_info",
"script": "host_info.py" "script": "host_info.py"
},
{
"name": "gpu_perftests",
"script": "gtest_perf_test.py",
"args": ["gpu_perftests"]
} }
] ]
}, },
...@@ -67,6 +87,11 @@ ...@@ -67,6 +87,11 @@
{ {
"name": "host_info", "name": "host_info",
"script": "host_info.py" "script": "host_info.py"
},
{
"name": "gpu_perftests",
"script": "gtest_perf_test.py",
"args": ["gpu_perftests"]
} }
] ]
}, },
......
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