Skip to content

Commit

Permalink
Revert 238758 "Pull down webgl conformance tests from github mir..."
Browse files Browse the repository at this point in the history
Due to licence issues. Will investigate and reland later.

> Pull down webgl conformance tests from github mirror.
> 
> BUG=325505
> TEST=gpu waterfall
> R=bajones@chromium.org, brettw@chromium.org, kbr@chromium.org
> 
> Review URL: https://codereview.chromium.org/100413002

TBR=zmo@chromium.org

Review URL: https://codereview.chromium.org/104723003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238786 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
zmo@chromium.org committed Dec 4, 2013
1 parent 5af871a commit 0359c70
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 21 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ v8.log
/third_party/valgrind
/third_party/webdriver/pylib
/third_party/webdriver/python/selenium
/third_party/webgl
/third_party/webgl_conformance
/third_party/WebKit
/third_party/webpagereplay/
/third_party/webrtc
Expand Down
7 changes: 3 additions & 4 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,8 @@ deps = {
"src/third_party/bidichecker":
(Var("googlecode_url") % "bidichecker") + "/trunk/lib@4",

"src/third_party/webgl/src":
Var("chromium_git") +
"/external/khronosgroup/webgl.git@159f31dd34842c871032d97d360a9dce5153f585",
"src/third_party/webgl_conformance":
"/trunk/deps/third_party/webgl/sdk/tests@230853",

"src/third_party/swig/Lib":
"/trunk/deps/third_party/swig/Lib@" + Var("swig_revision"),
Expand Down Expand Up @@ -389,7 +388,7 @@ deps_os = {
"src/third_party/usrsctp/usrsctplib": None,
"src/third_party/v8-i18n": None,
"src/third_party/webdriver/pylib": None,
"src/third_party/webgl": None,
"src/third_party/webgl_conformance": None,
"src/third_party/webpagereplay": None,
"src/third_party/webrtc": None,
"src/third_party/yasm/source/patched-yasm": None,
Expand Down
3 changes: 1 addition & 2 deletions content/test/gpu/gpu_tests/webgl_conformance.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
from telemetry.page import page_test

conformance_path = os.path.join(
util.GetChromiumSrcDir(),
'third_party', 'webgl', 'src', 'sdk', 'tests')
util.GetChromiumSrcDir(), 'third_party', 'webgl_conformance')

conformance_harness_script = r"""
var testHarness = {};
Expand Down
14 changes: 0 additions & 14 deletions third_party/webgl/README.chromium

This file was deleted.

0 comments on commit 0359c70

Please sign in to comment.