Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures.
authorRyan VanderMeulen <ryanvm@gmail.com>
Mon, 10 Mar 2014 15:31:23 -0400
changeset 173199 de734e8b03a3a4e55520b3991a48d7e9d1494c62
parent 173198 5a0bd36ed10388fcf7d873c61b31cff75c970fff
child 173236 91a34de66289511aa1dae4ebeb13818a15612b73
push id271
push userpvanderbeken@mozilla.com
push dateMon, 24 Mar 2014 22:43:42 +0000
bugs980015
milestone30.0a1
backs out88780b5a201eba8c7b9afdb14493be5535832521
Backed out changeset 88780b5a201e (bug 980015) for test_property_database.html failures. CLOSED TREE
build/mobile/robocop/Makefile.in
config/config.mk
config/makefiles/mochitest.mk
config/rules.mk
layout/style/test/Makefile.in
--- a/build/mobile/robocop/Makefile.in
+++ b/build/mobile/robocop/Makefile.in
@@ -52,29 +52,26 @@ INSTALL_TARGETS += robocop
 robocop_TARGET  := libs
 robocop_DEST    := $(CURDIR)
 robocop_FILES   := \
   $(TESTPATH)/robocop.ini \
   $(TESTPATH)/robocop_autophone.ini \
   $(NULL)
 robocop-deps := $(notdir $(robocop_FILES))
 
-ROBOCOP_FILES := \
+MOCHITEST_ROBOCOP_FILES := \
   $(wildcard $(TESTPATH)/*.html) \
   $(wildcard $(TESTPATH)/*.jpg) \
   $(wildcard $(TESTPATH)/*.sjs) \
   $(wildcard $(TESTPATH)/test*.js) \
   $(wildcard $(TESTPATH)/robocop*.js) \
   $(wildcard $(TESTPATH)/*.xml) \
   $(wildcard $(TESTPATH)/*.swf) \
   $(NULL)
 
-ROBOCOP_DEST = $(DEPTH)/_tests/testing/mochitest/tests/robocop/
-INSTALL_TARGETS += ROBOCOP
-
 GARBAGE += \
   AndroidManifest.xml \
   $(robocop-deps) \
   $(testconstants-dep) \
   $(NULL)
 
 JAVAFILES += \
   $(java-harness) \
--- a/config/config.mk
+++ b/config/config.mk
@@ -68,24 +68,18 @@ endif
   TIERS \
   TOOL_DIRS \
   XPCSHELL_TESTS \
   XPIDL_MODULE \
   $(NULL)
 
 _DEPRECATED_VARIABLES := \
   ANDROID_RESFILES \
-  MOCHITEST_A11Y_FILES \
-  MOCHITEST_BROWSER_FILES \
+  MOCHITEST_FILES_PARTS \
   MOCHITEST_BROWSER_FILES_PARTS \
-  MOCHITEST_CHROME_FILES \
-  MOCHITEST_FILES \
-  MOCHITEST_FILES_PARTS \
-  MOCHITEST_METRO_FILES \
-  MOCHITEST_ROBOCOP_FILES \
   SHORT_LIBNAME \
   $(NULL)
 
 ifndef EXTERNALLY_MANAGED_MAKE_FILE
 # Using $(firstword) may not be perfect. But it should be good enough for most
 # scenarios.
 _current_makefile = $(CURDIR)/$(firstword $(MAKEFILE_LIST))
 
new file mode 100644
--- /dev/null
+++ b/config/makefiles/mochitest.mk
@@ -0,0 +1,52 @@
+# -*- makefile -*-
+# vim:set ts=8 sw=8 sts=8 noet:
+#
+# 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/.
+
+ifndef INCLUDED_TESTS_MOCHITEST_MK #{
+
+#   $1- test directory name
+#   $2- optional: if passed dot used to flatten directory hierarchy copy
+# else- relativesrcdir
+mochitestdir = \
+    $(strip \
+      $(if $(2),$(DEPTH)/_tests/testing/mochitest/$1/. \
+        ,$(DEPTH)/_tests/testing/mochitest/$1/$(relativesrcdir) \
+    ))
+
+
+ifdef MOCHITEST_FILES
+MOCHITEST_DEST := $(call mochitestdir,tests)
+INSTALL_TARGETS += MOCHITEST
+endif
+
+ifdef MOCHITEST_CHROME_FILES
+MOCHITEST_CHROME_DEST := $(call mochitestdir,chrome)
+INSTALL_TARGETS += MOCHITEST_CHROME
+endif
+
+ifdef MOCHITEST_BROWSER_FILES
+MOCHITEST_BROWSER_DEST := $(call mochitestdir,browser)
+INSTALL_TARGETS += MOCHITEST_BROWSER
+endif
+
+ifdef MOCHITEST_A11Y_FILES
+MOCHITEST_A11Y_DEST := $(call mochitestdir,a11y)
+INSTALL_TARGETS += MOCHITEST_A11Y
+endif
+
+ifdef MOCHITEST_METRO_FILES
+MOCHITEST_METRO_DEST := $(call mochitestdir,metro)
+INSTALL_TARGETS += MOCHITEST_METRO
+endif
+
+ifdef MOCHITEST_ROBOCOP_FILES
+MOCHITEST_ROBOCOP_DEST := $(call mochitestdir,tests/robocop,flat_hierarchy)
+INSTALL_TARGETS += MOCHITEST_ROBOCOP
+endif
+
+INCLUDED_TESTS_MOCHITEST_MK := 1
+
+endif #} INCLUDED_TESTS_MOCHITEST_MK
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -94,16 +94,20 @@ ifdef ENABLE_TESTS
 # The current developer workflow expects tests to be updated when processing
 # the default target. If we ever change this implementation, the behavior
 # should be preserved or the change should be widely communicated. A
 # consequence of not processing test dir targets during the default target is
 # that changes to tests may not be updated and code could assume to pass
 # locally against non-current test code.
 DIRS += $(TEST_DIRS)
 
+ifndef INCLUDED_TESTS_MOCHITEST_MK #{
+  include $(topsrcdir)/config/makefiles/mochitest.mk
+endif #}
+
 ifdef CPP_UNIT_TESTS
 ifdef COMPILE_ENVIRONMENT
 
 # Compile the tests to $(DIST)/bin.  Make lots of niceties available by default
 # through TestHarness.h, by modifying the list of includes and the libs against
 # which stuff links.
 CPPSRCS += $(CPP_UNIT_TESTS)
 CPP_UNIT_TEST_BINS := $(CPP_UNIT_TESTS:.cpp=$(BIN_SUFFIX))
@@ -1626,16 +1630,22 @@ FREEZE_VARIABLES = \
   CPPSRCS \
   EXPORTS \
   DIRS \
   LIBRARY \
   MODULE \
   TIERS \
   EXTRA_COMPONENTS \
   EXTRA_PP_COMPONENTS \
+  MOCHITEST_FILES \
+  MOCHITEST_CHROME_FILES \
+  MOCHITEST_BROWSER_FILES \
+  MOCHITEST_A11Y_FILES \
+  MOCHITEST_METRO_FILES \
+  MOCHITEST_ROBOCOP_FILES \
   $(NULL)
 
 $(foreach var,$(FREEZE_VARIABLES),$(eval $(var)_FROZEN := '$($(var))'))
 
 CHECK_FROZEN_VARIABLES = $(foreach var,$(FREEZE_VARIABLES), \
   $(if $(subst $($(var)_FROZEN),,'$($(var))'),$(error Makefile variable '$(var)' changed value after including rules.mk. Was $($(var)_FROZEN), now $($(var)).)))
 
 libs export::
--- a/layout/style/test/Makefile.in
+++ b/layout/style/test/Makefile.in
@@ -15,13 +15,11 @@
 #LIBS += ../nsCSSKeywords.$(OBJ_SUFFIX) ../nsCSSProps.$(OBJ_SUFFIX) $(XPCOM_LIBS)
 
 ifdef COMPILE_ENVIRONMENT
 css_properties.js: host_ListCSSProperties$(HOST_BIN_SUFFIX) css_properties_like_longhand.js Makefile
 	$(RM) $@
 	./host_ListCSSProperties$(HOST_BIN_SUFFIX) > $@
 	cat $(srcdir)/css_properties_like_longhand.js >> $@
 
-GARBAGE += css_properties.js
-TEST_FILES := css_properties.js
-TEST_DEST = $(DIST)/_tests/testing/mochitest/$(relativesrcdir)
-INSTALL_TARGETS += TEST
+GARBAGE += css_properties.jsm
+MOCHITEST_FILES += css_properties.js
 endif