From f811790c240be9294151c9b32ec76b39b262381e Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 10 Jul 2013 09:18:26 +0100 Subject: [PATCH] Backed out changeset fbea533f8927 (bug 881997) for webgl conformance test failures --- content/canvas/test/webgl/moz.build | 1 - .../test/webgl/non-conf-tests/Makefile.in | 18 --------------- .../test/webgl/non-conf-tests/moz.build | 5 ---- .../test_webgl_conformance.html | 23 ------------------- 4 files changed, 47 deletions(-) delete mode 100644 content/canvas/test/webgl/non-conf-tests/Makefile.in delete mode 100644 content/canvas/test/webgl/non-conf-tests/moz.build delete mode 100644 content/canvas/test/webgl/non-conf-tests/test_webgl_conformance.html diff --git a/content/canvas/test/webgl/moz.build b/content/canvas/test/webgl/moz.build index 3d5c1e93c6e7..895d11993cfb 100644 --- a/content/canvas/test/webgl/moz.build +++ b/content/canvas/test/webgl/moz.build @@ -4,4 +4,3 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DIRS += ['non-conf-tests'] diff --git a/content/canvas/test/webgl/non-conf-tests/Makefile.in b/content/canvas/test/webgl/non-conf-tests/Makefile.in deleted file mode 100644 index 4f97d3bb43ee..000000000000 --- a/content/canvas/test/webgl/non-conf-tests/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - -MOCHITEST_FILES = \ - test_webgl_conformance.html \ - $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/content/canvas/test/webgl/non-conf-tests/moz.build b/content/canvas/test/webgl/non-conf-tests/moz.build deleted file mode 100644 index c271ec3908ce..000000000000 --- a/content/canvas/test/webgl/non-conf-tests/moz.build +++ /dev/null @@ -1,5 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. diff --git a/content/canvas/test/webgl/non-conf-tests/test_webgl_conformance.html b/content/canvas/test/webgl/non-conf-tests/test_webgl_conformance.html deleted file mode 100644 index fa15e0e3dac7..000000000000 --- a/content/canvas/test/webgl/non-conf-tests/test_webgl_conformance.html +++ /dev/null @@ -1,23 +0,0 @@ - -WebGL test: 'webgl' context request - - - - - - -