Index: testing/buildbot/chromium.perf.json |
diff --git a/testing/buildbot/chromium.perf.json b/testing/buildbot/chromium.perf.json |
index a8cde1e2faf6e8da118274a05705d5b704bd8d3d..b885776be769b5249a9d1e7b56796ab9e2880823 100644 |
--- a/testing/buildbot/chromium.perf.json |
+++ b/testing/buildbot/chromium.perf.json |
@@ -1,18 +1,20 @@ |
{ |
+ "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, |
+ "AAAAA2 See generate_perf_json.py to make changes": {}, |
"Android Galaxy S5 Perf (3)": { |
"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 +23,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 +52,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 +70,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,26 +104,23 @@ |
} |
] |
}, |
- "Mac 10.8 Perf (1)": { |
+ "Win 7 ATI GPU Perf (2)": { |
"scripts": [ |
{ |
"args": [ |
- "gpu_perftests", |
- "--test-launcher-print-test-stdio=always" |
+ "angle_perftests", |
+ "--test-launcher-print-test-stdio=always", |
+ "--test-launcher-jobs=1" |
], |
- "name": "gpu_perftests", |
+ "name": "angle_perftests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Mac 10.8 Perf (3)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
- "cc_perftests", |
+ "load_library_perf_tests", |
"--test-launcher-print-test-stdio=always" |
], |
- "name": "cc_perftests", |
+ "name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
}, |
{ |
@@ -134,37 +133,26 @@ |
], |
"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" |
} |
] |
}, |
- "Mac 10.9 Perf (1)": { |
+ "Win 7 Intel GPU Perf (1)": { |
"scripts": [ |
{ |
"args": [ |
- "gpu_perftests", |
- "--test-launcher-print-test-stdio=always" |
+ "angle_perftests", |
+ "--test-launcher-print-test-stdio=always", |
+ "--test-launcher-jobs=1" |
], |
- "name": "gpu_perftests", |
+ "name": "angle_perftests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Mac 10.9 Perf (3)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
- "cc_perftests", |
+ "load_library_perf_tests", |
"--test-launcher-print-test-stdio=always" |
], |
- "name": "cc_perftests", |
+ "name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
}, |
{ |
@@ -177,18 +165,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 Intel GPU Perf (2)": { |
"scripts": [ |
{ |
"args": [ |
@@ -201,6 +181,14 @@ |
}, |
{ |
"args": [ |
+ "load_library_perf_tests", |
+ "--test-launcher-print-test-stdio=always" |
+ ], |
+ "name": "load_library_perf_tests", |
+ "script": "gtest_perf_test.py" |
+ }, |
+ { |
+ "args": [ |
"performance_browser_tests", |
"--test-launcher-print-test-stdio=always", |
"--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
@@ -209,18 +197,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 Intel GPU Perf": { |
+ "Win 7 Intel GPU Perf (3)": { |
"scripts": [ |
{ |
"args": [ |
@@ -233,6 +213,14 @@ |
}, |
{ |
"args": [ |
+ "load_library_perf_tests", |
+ "--test-launcher-print-test-stdio=always" |
+ ], |
+ "name": "load_library_perf_tests", |
+ "script": "gtest_perf_test.py" |
+ }, |
+ { |
+ "args": [ |
"performance_browser_tests", |
"--test-launcher-print-test-stdio=always", |
"--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
@@ -241,6 +229,19 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
+ } |
+ ] |
+ }, |
+ "Win 7 Intel GPU Perf (4)": { |
+ "scripts": [ |
+ { |
+ "args": [ |
+ "angle_perftests", |
+ "--test-launcher-print-test-stdio=always", |
+ "--test-launcher-jobs=1" |
+ ], |
+ "name": "angle_perftests", |
+ "script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
@@ -249,11 +250,7 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 7 Low-End Perf (2)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
"performance_browser_tests", |
@@ -264,6 +261,19 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
+ } |
+ ] |
+ }, |
+ "Win 7 Intel GPU Perf (5)": { |
+ "scripts": [ |
+ { |
+ "args": [ |
+ "angle_perftests", |
+ "--test-launcher-print-test-stdio=always", |
+ "--test-launcher-jobs=1" |
+ ], |
+ "name": "angle_perftests", |
+ "script": "gtest_perf_test.py" |
}, |
{ |
"args": [ |
@@ -272,6 +282,17 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
+ }, |
+ { |
+ "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" |
} |
] |
}, |
@@ -288,6 +309,14 @@ |
}, |
{ |
"args": [ |
+ "load_library_perf_tests", |
+ "--test-launcher-print-test-stdio=always" |
+ ], |
+ "name": "load_library_perf_tests", |
+ "script": "gtest_perf_test.py" |
+ }, |
+ { |
+ "args": [ |
"performance_browser_tests", |
"--test-launcher-print-test-stdio=always", |
"--gtest_filter=TabCapturePerformanceTest.*:CastV2PerformanceTest.*", |
@@ -296,7 +325,11 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
+ } |
+ ] |
+ }, |
+ "Win 7 Perf (3)": { |
+ "scripts": [ |
{ |
"args": [ |
"load_library_perf_tests", |
@@ -304,11 +337,7 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 7 Perf (3)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
"performance_browser_tests", |
@@ -319,7 +348,11 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
+ } |
+ ] |
+ }, |
+ "Win 7 x64 Perf (2)": { |
+ "scripts": [ |
{ |
"args": [ |
"load_library_perf_tests", |
@@ -327,11 +360,7 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 7 x64 Perf (2)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
"performance_browser_tests", |
@@ -342,7 +371,11 @@ |
], |
"name": "performance_browser_tests", |
"script": "gtest_perf_test.py" |
- }, |
+ } |
+ ] |
+ }, |
+ "Win 8 Perf (2)": { |
+ "scripts": [ |
{ |
"args": [ |
"load_library_perf_tests", |
@@ -350,11 +383,7 @@ |
], |
"name": "load_library_perf_tests", |
"script": "gtest_perf_test.py" |
- } |
- ] |
- }, |
- "Win 8 Perf (2)": { |
- "scripts": [ |
+ }, |
{ |
"args": [ |
"performance_browser_tests", |
@@ -365,14 +394,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" |
} |
] |
} |