Bug 906342 - Move the remaining SIMPLE_PROGRAMS to moz.build and disallow setting SIMPLE_PROGRAMS in Makefiles; r=gps

config/rules.mk

@@ -27,6 +27,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   MODULE \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
+  SIMPLE_PROGRAMS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \

intl/uconv/tests/Makefile.in

@@ -11,24 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-# Tests disabled because they dont work in libxul builds.
-#MOZILLA_INTERNAL_API = 1
-#
-#
-#CPPSRCS		= \
-#		TestUConv.cpp \
-#		nsconv.cpp \
-#		plattest.cpp \
-#		$(NULL)
-#
-#ifeq ($(OS_ARCH),WINNT)
-#CPPSRCS		+= convperf.cpp
-#endif
-#
-#SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
-
-relativesrcdir	= @relativesrcdir@
-
 MOCHITEST_FILES =	\
 		test_bug335816.html \
 		test_bug843434.html \

intl/uconv/tests/moz.build

@@ -7,3 +7,20 @@
 MODULE = 'test_intl_uconv'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+# Tests disabled because they dont work in libxul builds.
+#MOZILLA_INTERNAL_API = True
+#
+#CPP_SOURCES += [
+#    'TestUConv.cpp',
+#    'nsconv.cpp',
+#    'plattest.cpp',
+#]
+#
+#if CONFIG['OS_ARCH'] == 'WINNT':
+#    CPP_SOURCES += [
+#        'convperf.cpp',
+#    ]
+#
+#SIMPLE_PROGRAMS += [source.replace('.cpp', CONFIG['BIN_SUFFIX']), CPP_SOURCES]
+

js/src/config/rules.mk

@@ -27,6 +27,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \
   MODULE \
   NO_DIST_INSTALL \
   PARALLEL_DIRS \
+  SIMPLE_PROGRAMS \
   TEST_DIRS \
   TIERS \
   TOOL_DIRS \

mozglue/tests/Makefile.in

@@ -10,7 +10,6 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_LINKER
-SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX)
 STL_FLAGS =
 
 LOCAL_INCLUDES += -I$(srcdir)/../linker

mozglue/tests/moz.build

@@ -11,3 +11,6 @@ if CONFIG['MOZ_LINKER']:
         'TestZip.cpp',
         'ShowSSEConfig.cpp',
     ]
+    SIMPLE_PROGRAMS += [
+        'TestZip' + CONFIG['BIN_SUFFIX'],
+    ]

toolkit/mozapps/update/test/Makefile.in

@@ -26,15 +26,6 @@ DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE)
 endif
 
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
-# TODO: Remove when SIMPLE_PROGRAMS is in moz.build
-cppsrcs = \
-  TestAUSReadStrings.cpp \
-  TestAUSHelper.cpp \
-  $(NULL)
-
-# TODO: Base off of CPP_SOURCES in moz.build
-SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
-
 INI_TEST_FILES = \
   TestAUSReadStrings1.ini \
   TestAUSReadStrings2.ini \

toolkit/mozapps/update/test/moz.build

@@ -6,9 +6,19 @@
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['chrome']
+
+    sources = [
+        'TestAUSHelper',
+        'TestAUSReadStrings',
+    ]
+
     CPP_SOURCES += [
-        'TestAUSReadStrings.cpp',
-        'TestAUSHelper.cpp',
+        '%s.cpp' % s for s in sources
+    ]
+
+    bin_suffix = CONFIG['BIN_SUFFIX']
+    SIMPLE_PROGRAMS += [
+        '%s%s' % (s, bin_suffix) for s in sources
     ]
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']