Index: chrome/test/perf/dromaeo_benchmark_uitest.cc |
diff --git a/chrome/test/perf/dromaeo_benchmark_uitest.cc b/chrome/test/perf/dromaeo_benchmark_uitest.cc |
index 71a148f8801c9e4b2377481880e66ea0fdac5bcf..b17687e10e5d088dab1c26c168b12d60559fcbf7 100644 |
--- a/chrome/test/perf/dromaeo_benchmark_uitest.cc |
+++ b/chrome/test/perf/dromaeo_benchmark_uitest.cc |
@@ -34,6 +34,8 @@ class DromaeoTest : public UIPerfTest { |
} |
void RunTest(const std::string& suite) { |
+ if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) |
+ return; |
FilePath test_path = GetDromaeoDir(); |
std::string query_string = suite + "&automated"; |
test_path = test_path.Append(FILE_PATH_LITERAL("index.html")); |
@@ -141,32 +143,132 @@ class DromaeoReferenceTest : public DromaeoTest { |
#define MAYBE_DOMCorePerf DOMCorePerf |
#endif |
TEST_F(DromaeoTest, MAYBE_DOMCorePerf) { |
- if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) |
- return; |
- |
RunTest("dom"); |
} |
-TEST_F(DromaeoTest, JSLibPerf) { |
- if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) |
- return; |
+TEST_F(DromaeoTest, DOMCoreAttrPerf) { |
+ RunTest("dom-attr"); |
+} |
+ |
+TEST_F(DromaeoTest, DOMCoreModifyPerf) { |
+ RunTest("dom-modify"); |
+} |
+ |
+TEST_F(DromaeoTest, DOMCoreQueryPerf) { |
+ RunTest("dom-query"); |
+} |
+TEST_F(DromaeoTest, DOMCoreTraversePerf) { |
+ RunTest("dom-traverse"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibPerf) { |
RunTest("jslib"); |
} |
-TEST_F(DromaeoReferenceTest, MAYBE_DOMCorePerf) { |
- if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) |
- return; |
+TEST_F(DromaeoTest, JSLibAttrJqueryPerf) { |
+ RunTest("jslib-attr-jquery"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibAttrPrototypePerf) { |
+ RunTest("jslib-attr-prototype"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibEventJqueryPerf) { |
+ RunTest("jslib-event-jquery"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibEventPrototypePerf) { |
+ RunTest("jslib-event-prototype"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibModifyJqueryPerf) { |
+ RunTest("jslib-modify-jquery"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibModifyPrototypePerf) { |
+ RunTest("jslib-modify-prototype"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibTraverseJqueryPerf) { |
+ RunTest("jslib-traverse-jquery"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibTraversePrototypePerf) { |
+ RunTest("jslib-traverse-prototype"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibStyleJqueryPerf) { |
+ RunTest("jslib-style-jquery"); |
+} |
+ |
+TEST_F(DromaeoTest, JSLibStylePrototypePerf) { |
+ RunTest("jslib-style-prototype"); |
+} |
+TEST_F(DromaeoReferenceTest, MAYBE_DOMCorePerf) { |
RunTest("dom"); |
} |
-TEST_F(DromaeoReferenceTest, JSLibPerf) { |
- if (!CommandLine::ForCurrentProcess()->HasSwitch(kRunDromaeo)) |
- return; |
+TEST_F(DromaeoReferenceTest, DOMCoreAttrPerf) { |
+ RunTest("dom-attr"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, DOMCoreModifyPerf) { |
+ RunTest("dom-modify"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, DOMCoreQueryPerf) { |
+ RunTest("dom-query"); |
+} |
+TEST_F(DromaeoReferenceTest, DOMCoreTraversePerf) { |
+ RunTest("dom-traverse"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibPerf) { |
RunTest("jslib"); |
} |
+TEST_F(DromaeoReferenceTest, JSLibAttrJqueryPerf) { |
+ RunTest("jslib-attr-jquery"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibAttrPrototypePerf) { |
+ RunTest("jslib-attr-prototype"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibEventJqueryPerf) { |
+ RunTest("jslib-event-jquery"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibEventPrototypePerf) { |
+ RunTest("jslib-event-prototype"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibModifyJqueryPerf) { |
+ RunTest("jslib-modify-jquery"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibModifyPrototypePerf) { |
+ RunTest("jslib-modify-prototype"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibTraverseJqueryPerf) { |
+ RunTest("jslib-traverse-jquery"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibTraversePrototypePerf) { |
+ RunTest("jslib-traverse-prototype"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibStyleJqueryPerf) { |
+ RunTest("jslib-style-jquery"); |
+} |
+ |
+TEST_F(DromaeoReferenceTest, JSLibStylePrototypePerf) { |
+ RunTest("jslib-style-prototype"); |
+} |
+ |
} // namespace |