Bug 896028 - Add a standard Makefile variable for mochitest-metro files [r=gps]

browser/metro/base/tests/mochiperf/Makefile.in

@@ -11,7 +11,7 @@ relativesrcdir  = @relativesrcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifndef MOZ_DEBUG
-PERF_TEST_FILES = \
+MOCHITEST_METRO_FILES = \
   ../mochitest/head.js \
   perfhelpers.js \
   browser_miscgfx_01.js \
@@ -22,20 +22,6 @@ PERF_TEST_FILES = \
   browser_layers_01.js \
   browser_firstx.js \
   $(NULL)
-
-PERF_RESOURCE_FILES = \
-  res/ripples.html \
-  res/scroll_test.html \
-  res/tidevideo.html \
-  res/tide.mp4 \
-  res/divs_test.html \
-  res/fx.png \
-  $(NULL)
-
-PERF_TEST_DEST := $(DEPTH)/_tests/testing/mochitest/metro/$(relativesrcdir)
-PERF_RESOURCE_DEST := $(DEPTH)/_tests/testing/mochitest/metro/$(relativesrcdir)/res
-
-INSTALL_TARGETS += PERF_TEST PERF_RESOURCE
 endif
 
 include $(topsrcdir)/config/rules.mk

browser/metro/base/tests/mochiperf/moz.build

@@ -2,3 +2,5 @@
 # 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/.
+
+TEST_DIRS += ['res']

browser/metro/base/tests/mochiperf/res/Makefile.in

@@ -0,0 +1,24 @@
+# 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
+
+ifndef MOZ_DEBUG
+MOCHITEST_METRO_FILES = \
+  ripples.html \
+  scroll_test.html \
+  tidevideo.html \
+  tide.mp4 \
+  divs_test.html \
+  fx.png \
+  $(NULL)
+endif
+
+include $(topsrcdir)/config/rules.mk

browser/metro/base/tests/mochiperf/res/moz.build

@@ -0,0 +1,4 @@
+# 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/.

browser/metro/base/tests/mochitest/Makefile.in

@@ -10,7 +10,7 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-BROWSER_TESTS = \
+MOCHITEST_METRO_FILES = \
   head.js \
   browser_urlbar.js \
   browser_bookmarks.js \
@@ -39,7 +39,7 @@ BROWSER_TESTS = \
   $(NULL)
 
 ifndef MOZ_DEBUG
-BROWSER_TESTS += \
+MOCHITEST_METRO_FILES += \
   browser_selection_basic.js \
   browser_selection_basic.html \
   browser_selection_textarea.js \
@@ -58,18 +58,4 @@ BROWSER_TESTS += \
   $(NULL)
 endif
 
-BROWSER_TEST_RESOURCES = \
-  res/image01.png \
-  res/textblock01.html \
-  res/textinput01.html \
-  res/textarea01.html \
-  res/testEngine.xml \
-  $(NULL)
-
-libs:: $(BROWSER_TESTS)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/metro/$(relativesrcdir)
-
-libs:: $(BROWSER_TEST_RESOURCES)
-	$(INSTALL) $(foreach f,$^,"$f") $(DEPTH)/_tests/testing/mochitest/metro/$(relativesrcdir)/res
-
 include $(topsrcdir)/config/rules.mk

browser/metro/base/tests/mochitest/moz.build

@@ -2,3 +2,5 @@
 # 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/.
+
+TEST_DIRS += ['res']

browser/metro/base/tests/mochitest/res/Makefile.in

@@ -0,0 +1,21 @@
+# 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_METRO_FILES = \
+  image01.png \
+  textblock01.html \
+  textinput01.html \
+  textarea01.html \
+  testEngine.xml \
+  $(NULL)
+
+include $(topsrcdir)/config/rules.mk

browser/metro/base/tests/mochitest/res/moz.build

@@ -0,0 +1,4 @@
+# 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/.

config/makefiles/mochitest.mk

@@ -58,6 +58,10 @@ ifdef MOCHITEST_A11Y_FILES
 $(eval $(call mochitest-libs-rule-template,MOCHITEST_A11Y_FILES,a11y))
 endif
 
+ifdef MOCHITEST_METRO_FILES
+$(eval $(call mochitest-libs-rule-template,MOCHITEST_METRO_FILES,metro))
+endif
+
 ifdef MOCHITEST_ROBOCOP_FILES
 $(eval $(call mochitest-libs-rule-template,MOCHITEST_ROBOCOP_FILES,tests/robocop,flat_hierarchy))
 endif

config/rules.mk

@@ -1874,6 +1874,7 @@ FREEZE_VARIABLES = \
   MOCHITEST_BROWSER_FILES \
   MOCHITEST_BROWSER_FILES_PARTS \
   MOCHITEST_A11Y_FILES \
+  MOCHITEST_METRO_FILES \
   MOCHITEST_ROBOCOP_FILES \
   MOCHITEST_WEBAPPRT_CHROME_FILES \
   $(NULL)

js/src/config/makefiles/mochitest.mk

@@ -58,6 +58,10 @@ ifdef MOCHITEST_A11Y_FILES
 $(eval $(call mochitest-libs-rule-template,MOCHITEST_A11Y_FILES,a11y))
 endif
 
+ifdef MOCHITEST_METRO_FILES
+$(eval $(call mochitest-libs-rule-template,MOCHITEST_METRO_FILES,metro))
+endif
+
 ifdef MOCHITEST_ROBOCOP_FILES
 $(eval $(call mochitest-libs-rule-template,MOCHITEST_ROBOCOP_FILES,tests/robocop,flat_hierarchy))
 endif

js/src/config/rules.mk

@@ -1874,6 +1874,7 @@ FREEZE_VARIABLES = \
   MOCHITEST_BROWSER_FILES \
   MOCHITEST_BROWSER_FILES_PARTS \
   MOCHITEST_A11Y_FILES \
+  MOCHITEST_METRO_FILES \
   MOCHITEST_ROBOCOP_FILES \
   MOCHITEST_WEBAPPRT_CHROME_FILES \
   $(NULL)