Bug 689040 - Add missing makefiles to services/makefiles.sh & move tests inside ENABLE_TESTS conditional; r=khuey
authorEd Morley <bmo@edmorley.co.uk>
Wed, 28 Sep 2011 09:26:24 +0100
changeset 77748 a4e8b6ead685c13116041145803c4b3195ef5abb
parent 77747 ceb669575a050fa1c1a75dcc9ae213e0f48a2ad5
child 77749 76e376b318708024517761e34bf8dd3b4116f994
push id2225
push userbmo@edmorley.co.uk
push dateWed, 28 Sep 2011 08:29:48 +0000
treeherdermozilla-inbound@76e376b31870 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs689040
milestone10.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 689040 - Add missing makefiles to services/makefiles.sh & move tests inside ENABLE_TESTS conditional; r=khuey
services/makefiles.sh
--- a/services/makefiles.sh
+++ b/services/makefiles.sh
@@ -37,16 +37,20 @@
 
 MAKEFILES_crypto="
   services/crypto/Makefile
   "
 
 MAKEFILES_sync="
   services/sync/Makefile
   services/sync/locales/Makefile
-  services/sync/tests/Makefile
   "
 
+if [ "$ENABLE_TESTS" ]; then
+  MAKEFILES_crypto="$MAKEFILES_crypto services/crypto/tests/Makefile"
+  MAKEFILES_sync="$MAKEFILES_sync services/sync/tests/Makefile"
+fi
+
 add_makefiles "
   services/Makefile
   $MAKEFILES_crypto
   $MAKEFILES_sync
   "