Bug 685518 part 2. Move the crossorigin webgl test to a saner location so I can add cross-origin non-webgl tests. r=roc
authorBoris Zbarsky <bzbarsky@mit.edu>
Fri, 09 Sep 2011 17:58:38 -0400
changeset 78160 5946c12881270d778e750dd76ba748c31218a02e
parent 78159 cb9eced21ea1b7aabfa358b700e34553c96334e5
child 78161 7dfaccb430c3863105b3aa839a7f81aa8d5f7f63
push id78
push userclegnitto@mozilla.com
push dateFri, 16 Dec 2011 17:32:24 +0000
treeherdermozilla-release@79d24e644fdd [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersroc
bugs685518
milestone9.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 685518 part 2. Move the crossorigin webgl test to a saner location so I can add cross-origin non-webgl tests. r=roc
content/canvas/test/Makefile.in
content/canvas/test/crossorigin/Makefile.in
content/canvas/test/crossorigin/image-allow-credentials.png
content/canvas/test/crossorigin/image-allow-credentials.png^headers^
content/canvas/test/crossorigin/image-allow-star.png
content/canvas/test/crossorigin/image-allow-star.png^headers^
content/canvas/test/crossorigin/image.png
content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
content/canvas/test/webgl/Makefile.in
content/canvas/test/webgl/crossorigin/image-allow-credentials.png
content/canvas/test/webgl/crossorigin/image-allow-credentials.png^headers^
content/canvas/test/webgl/crossorigin/image-allow-star.png
content/canvas/test/webgl/crossorigin/image-allow-star.png^headers^
content/canvas/test/webgl/crossorigin/image.png
content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -36,17 +36,17 @@
 #
 # ***** END LICENSE BLOCK *****
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = content/canvas/test
-DIRS		+= webgl
+DIRS		+= webgl crossorigin
 
 include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 _TEST_FILES_0 = \
 	test_canvas.html \
 	image_transparent50.png \
 	image_redtransparent.png \
 	image_yellow.png \
new file mode 100644
--- /dev/null
+++ b/content/canvas/test/crossorigin/Makefile.in
@@ -0,0 +1,57 @@
+#
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Mozilla Corporation.
+# Portions created by the Initial Developer are Copyright (C) 2010
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either of the GNU General Public License Version 2 or later (the "GPL"),
+# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
+DEPTH		= ../../../..
+topsrcdir	= @top_srcdir@
+srcdir		= @srcdir@
+VPATH		= @srcdir@
+relativesrcdir  = content/canvas/test/crossorigin
+
+include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/rules.mk
+_TEST_FILES = \
+	image-allow-credentials.png \
+	image-allow-credentials.png^headers^ \
+	image-allow-star.png \
+	image-allow-star.png^headers^ \
+	image.png \
+	test_canvas2d_crossorigin.html \
+	test_webgl_crossorigin_textures.html \
+	$(NULL)
+
+libs:: $(_TEST_FILES)
+	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
rename from content/canvas/test/webgl/crossorigin/image-allow-credentials.png
rename to content/canvas/test/crossorigin/image-allow-credentials.png
rename from content/canvas/test/webgl/crossorigin/image-allow-credentials.png^headers^
rename to content/canvas/test/crossorigin/image-allow-credentials.png^headers^
rename from content/canvas/test/webgl/crossorigin/image-allow-star.png
rename to content/canvas/test/crossorigin/image-allow-star.png
rename from content/canvas/test/webgl/crossorigin/image-allow-star.png^headers^
rename to content/canvas/test/crossorigin/image-allow-star.png^headers^
rename from content/canvas/test/webgl/crossorigin/image.png
rename to content/canvas/test/crossorigin/image.png
rename from content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html
rename to content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
--- a/content/canvas/test/webgl/crossorigin/test_webgl_crossorigin_textures.html
+++ b/content/canvas/test/crossorigin/test_webgl_crossorigin_textures.html
@@ -79,76 +79,76 @@
     try {
       gl = canvas.getContext("experimental-webgl");
     } catch (e) {
       SimpleTest.finish();
       return;
     }
 
 
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
                 "missing-value-default",
                 OK);
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
                 "",
                 OK);
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
                 "missing-value-default",
                 SECURITY_ERR);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
                 "",
                 SECURITY_ERR);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
                 "just-crossOrigin-without-value",
                 SECURITY_ERR);
 
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
                 "missing-value-default",
                 SECURITY_ERR);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
                 "",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
                 "anonymous",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
                 "use-credentials",
                 SECURITY_ERR);
 
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
                 "missing-value-default",
                 SECURITY_ERR);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
                 "",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
                 "just-crossOrigin-without-value",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
                 "anonymous",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
                 "use-credentials",
                 OK);
 
     // Test that bad values for crossorigin="..." are interpreted as invalid-value-default which is "anonymous".
-    testTexture("http://mochi.test:8888/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://mochi.test:8888/tests/content/canvas/test/crossorigin/image.png",
                 "foobar",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image.png",
                 "foobar",
                 SECURITY_ERR);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-star.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-star.png",
                 "foobar",
                 OK);
-    testTexture("http://example.com/tests/content/canvas/test/webgl/crossorigin/image-allow-credentials.png",
+    testTexture("http://example.com/tests/content/canvas/test/crossorigin/image-allow-credentials.png",
                 "foobar",
                 OK);
 
     all_tests_started = true;
   });
 </script>
--- a/content/canvas/test/webgl/Makefile.in
+++ b/content/canvas/test/webgl/Makefile.in
@@ -51,10 +51,9 @@ include $(topsrcdir)/config/rules.mk
   failing_tests_mac.txt \
   $(NULL)
 
 libs:: $(_TEST_FILES)
 	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)
 	$(TAR) -cf - -C $(srcdir) \
 	  resources \
 	  conformance \
-          crossorigin \
 	  | $(TAR) -xf - -C $(DEPTH)/_tests/testing/mochitest/tests/$(relativesrcdir)