Run our xpcshell tests during 'make distribution' on our buildbot slaves.

im/app/Makefile.in

@@ -342,6 +342,13 @@ GARBAGE += module.ver
 libs:: $(srcdir)/profile/prefs.js
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
+# XXX This is a hack to ensure that we get the right xpcshell.ini for our tests.
+# mozilla-central does this in testing/xpcshell-tests which means that it is very
+# hard for anyone to specify anything else.
+libs::
+	$(INSTALL) $(topsrcdir)/instantbird/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell
+	cp $(topsrcdir)/instantbird/test/xpcshell.ini $(MOZDEPTH)/_tests/xpcshell/all-test-dirs.list
+
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 
 AB := $(firstword $(subst -, ,$(AB_CD)))

im/build.mk

@@ -140,6 +140,9 @@ FORCE_UPDATE := components/components.list|Contents/MacOS/components/components.
 distribution:
 	@$(MAKE) buildsymbols
 	@$(MAKE) -C instantbird/installer libs installer
+ifdef ENABLE_TESTS
+	$(MAKE) xpcshell-tests
+endif
 ifdef MOZ_UPDATE_PACKAGING
 	$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update PKG_INST_PATH=
 endif

im/config/mozconfigs/linux/mozconfig

@@ -17,7 +17,6 @@ ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-tests
 ac_add_options --disable-dbus
 ac_add_options --disable-necko-wifi
 

im/config/mozconfigs/linux/mozconfig-release

@@ -17,7 +17,6 @@ ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-tests
 ac_add_options --disable-dbus
 ac_add_options --disable-necko-wifi
 ac_add_options --enable-official-branding

im/config/mozconfigs/macosx/mozconfig

@@ -32,7 +32,6 @@ ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-tests
 
 if [ `date +%m%d` = 1031 -o `date +%m%d` = 1101 ]; then
 ac_add_options --with-branding=instantbird/branding/halloween

im/config/mozconfigs/macosx/mozconfig-release

@@ -32,6 +32,5 @@ ac_add_options --enable-update-channel=release
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-tests
 ac_add_options --enable-official-branding
 ac_add_options --with-l10n-base=..

im/config/mozconfigs/win32/mozconfig

@@ -16,7 +16,6 @@ ac_add_options --enable-application=instantbird
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-tests
 ac_add_options --disable-webm
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc

im/config/mozconfigs/win32/mozconfig-release

@@ -16,7 +16,6 @@ ac_add_options --enable-application=instantbird
 ac_add_options --enable-update-channel=release
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
-ac_add_options --disable-tests
 ac_add_options --disable-webm
 ac_add_options --enable-update-packaging
 ac_add_options --enable-jemalloc