diff options
| author | jrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 04:55:45 +0000 |
|---|---|---|
| committer | jrt@chromium.org <jrt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 04:55:45 +0000 |
| commit | 8a63e4e8937c4396a5869289a3706ab4b5d85ea4 (patch) | |
| tree | c15c84037b2d36fcedfcfe0f527028bb037bfb32 /chrome/test/gpu | |
| parent | 40a089c802ae7e4e514d2228c84c115842c4d371 (diff) | |
| download | chromium_src-8a63e4e8937c4396a5869289a3706ab4b5d85ea4.zip chromium_src-8a63e4e8937c4396a5869289a3706ab4b5d85ea4.tar.gz chromium_src-8a63e4e8937c4396a5869289a3706ab4b5d85ea4.tar.bz2 | |
Moved WebGL repository to third_party.
According the the 3rd-party Chromium policy, all external libraries should be
in a third_party directory. All WebGL repository references now point to
src/third_party/webgl_conformance.
Source: http://www.chromium.org/developers/adding-3rd-party-libraries
Review URL: http://codereview.chromium.org/7473003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93339 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/gpu')
| -rwxr-xr-x | chrome/test/gpu/generate_webgl_conformance_test_list.py | 2 | ||||
| -rw-r--r-- | chrome/test/gpu/webgl_conformance_tests.cc | 16 |
2 files changed, 10 insertions, 8 deletions
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( |