Bug 800612 - 2/2 - Enable compiled code tests in content/canvas - r=ted
authorBenoit Jacob <bjacob@mozilla.com>
Fri, 09 Nov 2012 16:42:23 -0500
changeset 112880 a31d3b784446ca8eaf92c2f22dbed388297a47e1
parent 112879 d7d0cb3b68e01bf60f5a4b635d3e775f4900b265
child 112881 df73d3bca6e006051a08d15dd84347c59b288fb1
push id17812
push userbjacob@mozilla.com
push dateFri, 09 Nov 2012 21:42:35 +0000
treeherdermozilla-inbound@a31d3b784446 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs800612
milestone19.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 800612 - 2/2 - Enable compiled code tests in content/canvas - r=ted
content/canvas/Makefile.in
content/canvas/compiledtest/Makefile.in
content/canvas/compiledtest/TestWebGLElementArrayCache.cpp
content/canvas/test/Makefile.in
content/canvas/test/compiled/Makefile.in
content/canvas/test/compiled/TestWebGLElementArrayCache.cpp
--- a/content/canvas/Makefile.in
+++ b/content/canvas/Makefile.in
@@ -9,10 +9,14 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 PARALLEL_DIRS	= public src
 
 TEST_DIRS += test
 
+ifdef ENABLE_TESTS
+TOOL_DIRS += compiledtest
+endif
+
 include $(topsrcdir)/config/rules.mk
 
rename from content/canvas/test/compiled/Makefile.in
rename to content/canvas/compiledtest/Makefile.in
--- a/content/canvas/test/compiled/Makefile.in
+++ b/content/canvas/compiledtest/Makefile.in
@@ -7,16 +7,16 @@ topsrcdir := @top_srcdir@
 srcdir := @srcdir@
 VPATH := @srcdir@
 
 FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
 LOCAL_INCLUDES := \
-    -I$(srcdir)/../../src \
-    $(NULL)
+  -I$(srcdir)/../src \
+  $(NULL)
 
 CPP_UNIT_TESTS := \
   TestWebGLElementArrayCache.cpp \
   $(NULL)
 
 include $(topsrcdir)/config/rules.mk
rename from content/canvas/test/compiled/TestWebGLElementArrayCache.cpp
rename to content/canvas/compiledtest/TestWebGLElementArrayCache.cpp
--- a/content/canvas/test/Makefile.in
+++ b/content/canvas/test/Makefile.in
@@ -5,18 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir  = @relativesrcdir@
 DIRS		+= webgl crossorigin chrome
 
-# TEST_DIRS += compiled
-
 include $(DEPTH)/config/autoconf.mk
 MOCHITEST_FILES = \
 	test_canvas.html \
 	image_transparent50.png \
 	image_redtransparent.png \
 	image_yellow.png \
 	image_anim-poster-gr.png \
 	image_green-16x16.png \