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

--HG--
extra : rebase_source : 6c8b3ef583b3ad06de1b395db13bedee735f125e

build/Makefile.in

@@ -74,7 +74,7 @@ _LEAKTEST_DIR = $(DEPTH)/_leaktest
 
 _LEAKTEST_FILES =    \
 		automation.py \
-		automationutils.py \
+		$(CURDIR)/automationutils.py \
 		leaktest.py \
 		bloatcycle.html \
 		$(topsrcdir)/build/pgo/server-locations.txt \

build/automation-build.mk

@@ -74,6 +74,11 @@ 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

build/pgo/Makefile.in

@@ -59,7 +59,7 @@ include $(topsrcdir)/build/automation-build.mk
 
 _PGO_FILES = 	\
   automation.py \
-  $(topsrcdir)/build/automationutils.py \
+  $(CURDIR)/automationutils.py \
   profileserver.py \
   genpgocert.py \
   index.html \

layout/tools/reftest/Makefile.in

@@ -75,7 +75,7 @@ endif
 _HARNESS_FILES = \
   $(srcdir)/runreftest.py \
   automation.py \
-  $(topsrcdir)/build/automationutils.py \
+  $(CURDIR)/automationutils.py \
   $(NULL)
 
 $(_DEST_DIR):

testing/mochitest/Makefile.in

@@ -60,7 +60,7 @@ include $(topsrcdir)/build/automation-build.mk
 _SERV_FILES = 	\
 		runtests.py \
 		automation.py \
-		$(topsrcdir)/build/automationutils.py \
+		$(CURDIR)/automationutils.py \
 		gen_template.pl \
 		server.js \
 		harness-a11y.xul \