Back out revision dbdbe3ad0234 from bug 525047 - every leak test box that's clobbered since it landed has failed, not finding the first thing it tries to import from automationutils
authorGavin Sharp <gavin@gavinsharp.com>
Tue, 15 Dec 2009 23:35:30 -0500
changeset 36251 4bbe26190c7dc6dad0c1c3440a9064b92a2a8bd7
parent 36250 f598d9a8e73f308f344d435f6b8198545fcd2a25
child 36252 cad7e4cd761d097deb6f8d4032c0b3db649e72a1
push idunknown
push userunknown
push dateunknown
bugs525047
milestone1.9.3a1pre
backs outdbdbe3ad0234dd583e5e79e790d68d5eaa29b7a4
Back out revision dbdbe3ad0234 from bug 525047 - every leak test box that's clobbered since it landed has failed, not finding the first thing it tries to import from automationutils
build/Makefile.in
build/automation-build.mk
build/pgo/Makefile.in
layout/tools/reftest/Makefile.in
testing/mochitest/Makefile.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -69,17 +69,17 @@ include $(topsrcdir)/config/rules.mk
 # we install to _leaktest/
 TARGET_DEPTH = ..
 include $(srcdir)/automation-build.mk
 
 _LEAKTEST_DIR = $(DEPTH)/_leaktest
 
 _LEAKTEST_FILES =    \
 		automation.py \
-		automationutils.py \
+		$(CURDIR)/automationutils.py \
 		leaktest.py \
 		bloatcycle.html \
 		$(topsrcdir)/build/pgo/server-locations.txt \
 		$(NULL)
 
 leaktest.py: leaktest.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $^ > $@
 	chmod +x $@
--- a/build/automation-build.mk
+++ b/build/automation-build.mk
@@ -69,11 +69,16 @@ AUTOMATION_PPARGS += -DIS_DEBUG_BUILD=0
 endif
 
 ifdef MOZ_CRASHREPORTER
 AUTOMATION_PPARGS += -DCRASHREPORTER=1
 else
 AUTOMATION_PPARGS += -DCRASHREPORTER=0
 endif
 
-automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk
+$(CURDIR)/automationutils.py: $(MOZILLA_DIR)/build/automationutils.py
+	$(INSTALL) $< .
+
+automation.py: $(MOZILLA_DIR)/build/automation.py.in $(MOZILLA_DIR)/build/automation-build.mk $(CURDIR)/automationutils.py
 	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py \
 	$(AUTOMATION_PPARGS) $(DEFINES) $(ACDEFINES) $< > $@
+
+GARBAGE += automation.py $(CURDIR)/automationutils.py
--- a/build/pgo/Makefile.in
+++ b/build/pgo/Makefile.in
@@ -54,17 +54,17 @@ include $(topsrcdir)/config/rules.mk
 # We install to _profile/pgo
 TARGET_DEPTH = ../..
 include $(topsrcdir)/build/automation-build.mk
 
 # Stuff to make a build with a profile
 
 _PGO_FILES = 	\
   automation.py \
-  $(topsrcdir)/build/automationutils.py \
+  $(CURDIR)/automationutils.py \
   profileserver.py \
   genpgocert.py \
   index.html \
   server-locations.txt \
   favicon.ico \
   $(NULL)
 
 genpgocert.py: genpgocert.py.in
--- a/layout/tools/reftest/Makefile.in
+++ b/layout/tools/reftest/Makefile.in
@@ -70,17 +70,17 @@ make-xpi:
 	+$(MAKE) -C $(CURDIR) libs XPI_NAME=reftest
 copy-harness: make-xpi
 libs:: copy-harness
 endif
 
 _HARNESS_FILES = \
   $(srcdir)/runreftest.py \
   automation.py \
-  $(topsrcdir)/build/automationutils.py \
+  $(CURDIR)/automationutils.py \
   $(NULL)
 
 $(_DEST_DIR):
 	$(NSINSTALL) -D $@
 
 $(_HARNESS_FILES): $(_DEST_DIR)
 
 # copy harness and the reftest extension bits to $(_DEST_DIR)
--- a/testing/mochitest/Makefile.in
+++ b/testing/mochitest/Makefile.in
@@ -55,17 +55,17 @@ include $(topsrcdir)/config/rules.mk
 # necessary for relative objdir paths.
 TARGET_DEPTH = ../../..
 include $(topsrcdir)/build/automation-build.mk
 
 # files that get copied into $objdir/_tests/
 _SERV_FILES = 	\
 		runtests.py \
 		automation.py \
-		$(topsrcdir)/build/automationutils.py \
+		$(CURDIR)/automationutils.py \
 		gen_template.pl \
 		server.js \
 		harness-a11y.xul \
 		harness-overlay.xul \
 		harness.xul \
 		browser-test-overlay.xul \
 		browser-test.js \
 		browser-harness.xul \