diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/test/data/gpu/webgl_conformance.html | 5 | ||||
| -rwxr-xr-x | chrome/test/gpu/generate_webgl_conformance_test_list.py | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/webgl_conformance_tests.cc | 16 |
5 files changed, 15 insertions, 12 deletions
@@ -58,7 +58,6 @@ v8.log /chrome/test/data/osdd /chrome/test/data/plugin /chrome/test/data/pyauto_private -/chrome/test/data/gpu/webgl_conformance /chrome/tools/memory /chrome/tools/test/reference_build /chrome_frame/tools/test/reference_build @@ -133,6 +132,7 @@ v8.log /third_party/swig /third_party/valgrind /third_party/webdriver/python +/third_party/webgl_conformance /third_party/webrtc /third_party/xdg-utils /third_party/xulrunner-sdk @@ -131,7 +131,7 @@ deps = { "src/third_party/bidichecker": (Var("googlecode_url") % "bidichecker") + "/trunk/lib@4", - "src/chrome/test/data/gpu/webgl_conformance": + "src/third_party/webgl_conformance": "/trunk/deps/third_party/webgl/sdk/tests@91578", # We run these layout tests as UI tests. Since many of the buildbots that diff --git a/chrome/test/data/gpu/webgl_conformance.html b/chrome/test/data/gpu/webgl_conformance.html index 90263fc..ca067e7 100644 --- a/chrome/test/data/gpu/webgl_conformance.html +++ b/chrome/test/data/gpu/webgl_conformance.html @@ -1,9 +1,10 @@ <html> <head> <script type="text/javascript" - src="webgl_conformance/resources/webgl-test-harness.js"> + src="../../../../third_party/webgl_conformance/resources/webgl-test-harness.js"> </script> <script> +var BASE_URL = "../../../../third_party/webgl_conformance/"; var running; var result; var message; @@ -70,7 +71,7 @@ function start(start_url) { var iframe = document.getElementById("testframe"); var testHarness = new WebGLTestHarnessModule.TestHarness( iframe, - start_url, + BASE_URL + start_url, report); window.webglTestHarness = testHarness; window.webglTestHarness.runTests(); diff --git a/chrome/test/gpu/generate_webgl_conformance_test_list.py b/chrome/test/gpu/generate_webgl_conformance_test_list.py index 7b694b6..8b05b4e 100755 --- a/chrome/test/gpu/generate_webgl_conformance_test_list.py +++ b/chrome/test/gpu/generate_webgl_conformance_test_list.py @@ -39,7 +39,7 @@ HEADER_GUARD_END = """ """ # Assume this script is run from the src/chrome/ directory. -INPUT_DIR = "test/data/gpu/webgl_conformance" +INPUT_DIR = "../third_party/webgl_conformance" INPUT_FILE = "00_test_list.txt" def main(argv): diff --git a/chrome/test/gpu/webgl_conformance_tests.cc b/chrome/test/gpu/webgl_conformance_tests.cc index 7aa1628..5f3971b 100644 --- a/chrome/test/gpu/webgl_conformance_tests.cc +++ b/chrome/test/gpu/webgl_conformance_tests.cc @@ -41,15 +41,18 @@ class WebGLConformanceTests : public UITest { } void RunTest(const std::string& url) { - FilePath test_path; - PathService::Get(chrome::DIR_TEST_DATA, &test_path); - test_path = test_path.Append(FILE_PATH_LITERAL("gpu")); - - FilePath webgl_conformance_path = test_path.Append( + FilePath webgl_conformance_path; + PathService::Get(base::DIR_SOURCE_ROOT, &webgl_conformance_path); + webgl_conformance_path = webgl_conformance_path.Append( + FILE_PATH_LITERAL("third_party")); + webgl_conformance_path = webgl_conformance_path.Append( FILE_PATH_LITERAL("webgl_conformance")); ASSERT_TRUE(file_util::DirectoryExists(webgl_conformance_path)) << "Missing conformance tests: " << webgl_conformance_path.value(); + FilePath test_path; + PathService::Get(chrome::DIR_TEST_DATA, &test_path); + test_path = test_path.Append(FILE_PATH_LITERAL("gpu")); test_path = test_path.Append(FILE_PATH_LITERAL("webgl_conformance.html")); scoped_refptr<TabProxy> tab(GetActiveTab()); @@ -58,9 +61,8 @@ class WebGLConformanceTests : public UITest { ASSERT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS, tab->NavigateToURL(net::FilePathToFileURL(test_path))); - // Start the test. Note: prepend the WebGL conformance test directory. ASSERT_TRUE(tab->NavigateToURLAsync( - GURL("javascript:start('webgl_conformance/" + url + "');"))); + GURL("javascript:start('" + url + "');"))); // Block until the test completes. ASSERT_TRUE(WaitUntilJavaScriptCondition( |