Index: testing/buildbot/chromium.perf.json |
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json |
index a8cde1e2faf6e8da118274a05705d5b704bd8d3d..a3ed0ed426ed8b99404831c61a50ca9d29fcaebe 100644 |
--- a/testing/buildbot/chromium.perf.json |
+++ b/testing/buildbot/chromium.perf.json |
@@ -3,16 +3,16 @@ |
"scripts": [ |
{ |
"args": [ |
- "gpu_perftests" |
+ "cc_perftests" |
], |
- "name": "gpu_perftests", |
+ "name": "cc_perftests", |
"script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
- "cc_perftests" |
+ "gpu_perftests" |
], |
- "name": "cc_perftests", |
+ "name": "gpu_perftests", |
"script": "gtest_perf_test.py" |
} |
] |
@@ -21,16 +21,16 @@ |
"scripts": [ |
{ |
"args": [ |
- "gpu_perftests" |
+ "cc_perftests" |
], |
- "name": "gpu_perftests", |
+ "name": "cc_perftests", |
"script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
- "cc_perftests" |
+ "gpu_perftests" |
], |
- "name": "cc_perftests", |
+ "name": "gpu_perftests", |
"script": "gtest_perf_test.py" |
} |
] |
@@ -50,16 +50,16 @@ |
"scripts": [ |
{ |
"args": [ |
- "gpu_perftests" |
+ "cc_perftests" |
], |
- "name": "gpu_perftests", |
+ "name": "cc_perftests", |
"script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
- "cc_perftests" |
+ "gpu_perftests" |
], |
- "name": "cc_perftests", |
+ "name": "gpu_perftests", |
"script": "gtest_perf_test.py" |
} |
] |
@@ -68,16 +68,16 @@ |
"scripts": [ |
{ |
"args": [ |
- "gpu_perftests" |
+ "cc_perftests" |
], |
- "name": "gpu_perftests", |
+ "name": "cc_perftests", |
"script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
- "cc_perftests" |
+ "gpu_perftests" |
], |
- "name": "cc_perftests", |
+ "name": "gpu_perftests", |
"script": "gtest_perf_test.py" |
} |
] |
@@ -102,37 +102,15 @@ |
} |
] |
}, |
- "Mac 10.8 Perf (1)": { |
- "scripts": [ |
- { |
- "args": [ |
- "gpu_perftests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "gpu_perftests", |
- "script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Mac 10.8 Perf (3)": { |
+ "Win 7 ATI GPU Perf (2)": { |
"scripts": [ |
{ |
"args": [ |
- "cc_perftests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "cc_perftests", |
- "script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
- "performance_browser_tests", |
+ "angle_perftests", |
"--test-launcher-print-test-stdio=always", |
- "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
- "--test-launcher-jobs=1", |
- "--enable-gpu" |
+ "--test-launcher-jobs=1" |
], |
- "name": "performance_browser_tests", |
+ "name": "angle_perftests", |
"script": "gtest_perf_test.py" |
}, |
{ |
@@ -142,30 +120,6 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Mac 10.9 Perf (1)": { |
- "scripts": [ |
- { |
- "args": [ |
- "gpu_perftests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "gpu_perftests", |
- "script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Mac 10.9 Perf (3)": { |
- "scripts": [ |
- { |
- "args": [ |
- "cc_perftests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "cc_perftests", |
- "script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
@@ -177,18 +131,10 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
- "load_library_perf_tests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "load_library_perf_tests", |
- "script": "gtest_perf_test.py" |
} |
] |
}, |
- "Win 7 ATI GPU Perf (2)": { |
+ "Win 7 Nvidia GPU Perf (2)": { |
"scripts": [ |
{ |
"args": [ |
@@ -201,35 +147,11 @@ |
}, |
{ |
"args": [ |
- "performance_browser_tests", |
- "--test-launcher-print-test-stdio=always", |
- "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
- "--test-launcher-jobs=1", |
- "--enable-gpu" |
- ], |
- "name": "performance_browser_tests", |
- "script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
"load_library_perf_tests", |
"--test-launcher-print-test-stdio=always" |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 7 Intel GPU Perf": { |
- "scripts": [ |
- { |
- "args": [ |
- "angle_perftests", |
- "--test-launcher-print-test-stdio=always", |
- "--test-launcher-jobs=1" |
- ], |
- "name": "angle_perftests", |
- "script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
@@ -241,50 +163,18 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
- "load_library_perf_tests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "load_library_perf_tests", |
- "script": "gtest_perf_test.py" |
} |
] |
}, |
- "Win 7 Low-End Perf (2)": { |
+ "Win 7 Perf (3)": { |
"scripts": [ |
{ |
"args": [ |
- "performance_browser_tests", |
- "--test-launcher-print-test-stdio=always", |
- "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
- "--test-launcher-jobs=1", |
- "--enable-gpu" |
- ], |
- "name": "performance_browser_tests", |
- "script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
"load_library_perf_tests", |
"--test-launcher-print-test-stdio=always" |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 7 Nvidia GPU Perf (2)": { |
- "scripts": [ |
- { |
- "args": [ |
- "angle_perftests", |
- "--test-launcher-print-test-stdio=always", |
- "--test-launcher-jobs=1" |
- ], |
- "name": "angle_perftests", |
- "script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
@@ -296,42 +186,19 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
- "load_library_perf_tests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "load_library_perf_tests", |
- "script": "gtest_perf_test.py" |
} |
] |
}, |
- "Win 7 Perf (3)": { |
+ "Win 7 x64 Perf (2)": { |
"scripts": [ |
{ |
"args": [ |
- "performance_browser_tests", |
- "--test-launcher-print-test-stdio=always", |
- "--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
- "--test-launcher-jobs=1", |
- "--enable-gpu" |
- ], |
- "name": "performance_browser_tests", |
- "script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
"load_library_perf_tests", |
"--test-launcher-print-test-stdio=always" |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 7 x64 Perf (2)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
"performance_browser_tests", |
@@ -342,7 +209,11 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
+ } |
+ ] |
+ }, |
+ "Win 8 Perf (2)": { |
+ "scripts": [ |
{ |
"args": [ |
"load_library_perf_tests", |
@@ -350,11 +221,7 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 8 Perf (2)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
"performance_browser_tests", |
@@ -365,14 +232,6 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
- { |
- "args": [ |
- "load_library_perf_tests", |
- "--test-launcher-print-test-stdio=always" |
- ], |
- "name": "load_library_perf_tests", |
- "script": "gtest_perf_test.py" |
} |
] |
} |