diff options
| author | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 03:50:23 +0000 |
|---|---|---|
| committer | yongsheng.zhu@intel.com <yongsheng.zhu@intel.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 03:50:23 +0000 |
| commit | b5e3497fd9c61698b4529c2e5c66b89695f34b3b (patch) | |
| tree | b7b37b82843ea3593df4f30733a19eddd1d87fde /content/test/gpu | |
| parent | 3f9ab536e81f6ba3fb21123c71130781e0da0ca3 (diff) | |
| download | chromium_src-b5e3497fd9c61698b4529c2e5c66b89695f34b3b.zip chromium_src-b5e3497fd9c61698b4529c2e5c66b89695f34b3b.tar.gz chromium_src-b5e3497fd9c61698b4529c2e5c66b89695f34b3b.tar.bz2 | |
Enable webgl conformance tests under content/test/gpu in content_browsertests
It enables the webgl conformace test in content_browsertests basing on
chrome/test/gpu.
BUG=149892
TEST=
Review URL: https://chromiumcodereview.appspot.com/10916334
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158742 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/gpu')
| -rw-r--r-- | content/test/gpu/gpu_test_expectations_parser.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/content/test/gpu/gpu_test_expectations_parser.cc b/content/test/gpu/gpu_test_expectations_parser.cc index 8caedc7..756239d 100644 --- a/content/test/gpu/gpu_test_expectations_parser.cc +++ b/content/test/gpu/gpu_test_expectations_parser.cc @@ -12,6 +12,7 @@ #include "base/string_split.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "content/public/common/content_paths.h" namespace { @@ -499,11 +500,9 @@ bool GPUTestExpectationsParser::GetExpectationsPath( bool rt = true; switch (profile) { case kWebGLConformanceTest: - rt = PathService::Get(base::DIR_SOURCE_ROOT, path); + rt = PathService::Get(content::DIR_TEST_DATA, path); if (rt) { - *path = path->Append(FILE_PATH_LITERAL("chrome")) - .Append(FILE_PATH_LITERAL("test")) - .Append(FILE_PATH_LITERAL("gpu")) + *path = path->Append(FILE_PATH_LITERAL("gpu")) .Append(FILE_PATH_LITERAL( "webgl_conformance_test_expectations.txt")); rt = file_util::PathExists(*path); |