Remove 192 ifdefs for code added for bug 539394 / bug 525047 now that bug 525047 has landed on the 1.9.2 branch. a=bustage fix (clobbered builds pick this up).
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 01 Mar 2010 11:39:18 +0000
changeset 5027 b5f5f67b5098711eed8f1baa71731797c3c19983
parent 5026 8fa3a4aefbffad8f72f99c7880d974af6261ac0a
child 5028 908177e763f67d67c6abecbbe42f4d3995debd5f
push idunknown
push userunknown
push dateunknown
reviewersbustage
bugs539394, 525047
Remove 192 ifdefs for code added for bug 539394 / bug 525047 now that bug 525047 has landed on the 1.9.2 branch. a=bustage fix (clobbered builds pick this up).
mail/test/mozmill/Makefile.in
--- a/mail/test/mozmill/Makefile.in
+++ b/mail/test/mozmill/Makefile.in
@@ -47,33 +47,23 @@ MODULE = mozmill
 include $(topsrcdir)/config/rules.mk
 
 # We're installing to _tests/mozmill
 TARGET_DEPTH = ../..
 include $(MOZILLA_DIR)/build/automation-build.mk
 
 _DEST_DIR = $(MOZDEPTH)/_tests/mozmill
 
-ifdef MOZILLA_1_9_2_BRANCH
-_HARNESS_FILES = \
-	$(srcdir)/runtest.py \
-	$(srcdir)/runtestlist.py \
-	$(srcdir)/mozmilltests.list \
-	automation.py \
-	automationutils.py \
-	$(NULL)
-else
 _HARNESS_FILES = \
 	$(srcdir)/runtest.py \
 	$(srcdir)/runtestlist.py \
 	$(srcdir)/mozmilltests.list \
 	automation.py \
 	$(MOZILLA_DIR)/build/automationutils.py \
 	$(NULL)
-endif
 
 GARBAGE += automation.py
 
 $(_DEST_DIR):
 	echo $(_HARNESS_FILES)
 	$(NSINSTALL) -D $@
 
 $(_HARNESS_FILES): $(_DEST_DIR)