Bug 495021 - CAPS unconditionally builds tests, r=shaver
authorPhil Ringnalda <philringnalda@gmail.com>
Sat, 13 Jun 2009 11:53:38 -0700
changeset 29200 ee3149258d6402bf71e29dc0032f1ea46303d3ce
parent 29199 b978be758ac2b5fcc6bc7597745378b05586ed67
child 29201 915ca567a19db7e80f7245bfa250189d2ab4e3cd
push idunknown
push userunknown
push dateunknown
reviewersshaver
bugs495021
milestone1.9.2a1pre
Bug 495021 - CAPS unconditionally builds tests, r=shaver
caps/Makefile.in
toolkit/toolkit-makefiles.sh
--- a/caps/Makefile.in
+++ b/caps/Makefile.in
@@ -38,12 +38,16 @@
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 MODULE		= caps
-DIRS		= idl include src tests
+DIRS		= idl include src
+
+ifdef ENABLE_TESTS
+DIRS		+= tests
+endif
 
 include $(topsrcdir)/config/rules.mk
 
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -437,16 +437,18 @@ MAKEFILES_rdf="
   rdf/tests/rdfpoll/Makefile
 "
 
 MAKEFILES_caps="
   caps/Makefile
   caps/idl/Makefile
   caps/include/Makefile
   caps/src/Makefile
+  caps/tests/Makefile
+  caps/tests/mochitest/Makefile
 "
 
 MAKEFILES_chrome="
   chrome/Makefile
   chrome/public/Makefile
   chrome/src/Makefile
 "