diff options
| author | jrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 02:30:26 +0000 |
|---|---|---|
| committer | jrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-26 02:30:26 +0000 |
| commit | 40646b01c67e88588d8c30881c2cf1145ad073e0 (patch) | |
| tree | 0689dca9bd63ddd7d4f6be7aee74a4c934f805c2 | |
| parent | 3e74c0652df00f546932a7f1894d45c84b2466e6 (diff) | |
| download | chromium_src-40646b01c67e88588d8c30881c2cf1145ad073e0.zip chromium_src-40646b01c67e88588d8c30881c2cf1145ad073e0.tar.gz chromium_src-40646b01c67e88588d8c30881c2cf1145ad073e0.tar.bz2 | |
Use content from trunk/deps for frame rate tests.
After r93671, all frame rate test content is located in trunk/deps/frame_rate/content.
Now it maps to src/chrome/test/data/perf/frame_rate/content and all references
are updated accordingly.
See: http://codereview.chromium.org/7461031/
Review URL: http://codereview.chromium.org/7467030
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@94022 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | DEPS | 3 | ||||
| -rw-r--r-- | chrome/test/data/perf/frame_rate/blank/test.html | 4 | ||||
| -rw-r--r-- | chrome/test/data/perf/frame_rate/head.js | 2 | ||||
| -rw-r--r-- | chrome/test/perf/frame_rate/frame_rate_tests.cc | 6 |
5 files changed, 8 insertions, 8 deletions
@@ -56,6 +56,7 @@ v8.log /chrome/test/data/firefox3_searchplugins /chrome/test/data/layout_tests /chrome/test/data/osdd +/chrome/test/data/perf/frame_rate/content /chrome/test/data/plugin /chrome/test/data/pyauto_private /chrome/tools/memory @@ -135,6 +135,9 @@ deps = { "src/tools/page_cycler/acid3": "/trunk/deps/page_cycler/acid3@19546", + "src/chrome/test/data/perf/frame_rate/content": + "/trunk/deps/frame_rate/content@93671", + "src/third_party/bidichecker": (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4", diff --git a/chrome/test/data/perf/frame_rate/blank/test.html b/chrome/test/data/perf/frame_rate/blank/test.html deleted file mode 100644 index aa8ac5c..0000000 --- a/chrome/test/data/perf/frame_rate/blank/test.html +++ /dev/null @@ -1,4 +0,0 @@ -<html> -<head><script src="../head.js"></script></head> -<body style="height: 10000px"></body> -</html> diff --git a/chrome/test/data/perf/frame_rate/head.js b/chrome/test/data/perf/frame_rate/head.js index e9ee256..870b8d3 100644 --- a/chrome/test/data/perf/frame_rate/head.js +++ b/chrome/test/data/perf/frame_rate/head.js @@ -32,8 +32,6 @@ * {"time_ms":1, "y":0}, * ... pasted output ... * ], - * - * @author jrt@chromium.org (Joe Tessler) */ var __running = false; diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc index 1c5839d..43b9ec1 100644 --- a/chrome/test/perf/frame_rate/frame_rate_tests.cc +++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc @@ -30,6 +30,7 @@ class FrameRateTest : public UIPerfTest { PathService::Get(chrome::DIR_TEST_DATA, &test_path); test_path = test_path.Append(FILE_PATH_LITERAL("perf")); test_path = test_path.Append(FILE_PATH_LITERAL("frame_rate")); + test_path = test_path.Append(FILE_PATH_LITERAL("content")); test_path = test_path.AppendASCII(name); return test_path; } @@ -92,13 +93,14 @@ class FrameRateTest_Reference : public FrameRateTest { } }; -#define ALL_FRAME_RATE_TESTS(content) \ +#define FRAME_RATE_TEST(content) \ TEST_F(FrameRateTest, content) { \ RunTest(#content, ""); \ } \ TEST_F(FrameRateTest_Reference, content) { \ RunTest(#content, "_ref"); \ } -ALL_FRAME_RATE_TESTS(blank); +FRAME_RATE_TEST(blank); +FRAME_RATE_TEST(googleblog); } // namespace |