From 26166581998beecfaf2807579d7974bf049a142d Mon Sep 17 00:00:00 2001
From: Joey Armstrong <joey@mozilla.com>
Date: Thu, 13 Jun 2013 17:49:21 -0400
Subject: [PATCH] bug 872086-2: move SIMPLE_PROGRAMS to moz.build (file batch
 #2) r=mshal

---
 mozglue/tests/Makefile.in               | 2 +-
 mozglue/tests/moz.build                 | 3 +++
 toolkit/mozapps/update/test/Makefile.in | 2 +-
 toolkit/mozapps/update/test/moz.build   | 7 +++++++
 uriloader/exthandler/tests/Makefile.in  | 2 +-
 uriloader/exthandler/tests/moz.build    | 5 +++++
 xpcom/tests/Makefile.in                 | 2 +-
 xpcom/tests/external/Makefile.in        | 2 +-
 xpcom/tests/external/moz.build          | 3 +++
 xpcom/tests/moz.build                   | 6 ++++++
 10 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in
index 17809fb2de6e..d437a47c754d 100644
--- a/mozglue/tests/Makefile.in
+++ b/mozglue/tests/Makefile.in
@@ -10,7 +10,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_LINKER
-SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX)
+DISABLE_SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX)
 NO_DIST_INSTALL = 1
 STL_FLAGS =
 
diff --git a/mozglue/tests/moz.build b/mozglue/tests/moz.build
index e9d5e9737369..1f995db62247 100644
--- a/mozglue/tests/moz.build
+++ b/mozglue/tests/moz.build
@@ -8,3 +8,6 @@ if CONFIG['MOZ_LINKER']:
     CPP_SOURCES += [
         'TestZip.cpp',
     ]
+    SIMPLE_PROGRAMS += [
+        'TestZip%s' % CONFIG['BIN_SUFFIX'],
+    ]
diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in
index b01aac72a218..16b88f940a62 100644
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -33,7 +33,7 @@ cppsrcs = \
   $(NULL)
 
 # TODO: Base off of CPP_SOURCES in moz.build
-SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
+DISABLED_SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
 
 INI_TEST_FILES = \
   TestAUSReadStrings1.ini \
diff --git a/toolkit/mozapps/update/test/moz.build b/toolkit/mozapps/update/test/moz.build
index 991aa438a3b3..1a796a8a7c2f 100644
--- a/toolkit/mozapps/update/test/moz.build
+++ b/toolkit/mozapps/update/test/moz.build
@@ -12,3 +12,10 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     ]
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
+    programs = [
+        fyl[0:-4] for fyl in CPP_SOURCES
+    ]
+    programs.sort()
+    SIMPLE_PROGRAMS += programs
diff --git a/uriloader/exthandler/tests/Makefile.in b/uriloader/exthandler/tests/Makefile.in
index 065e79656bd4..e94681df570c 100644
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@@ -12,7 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS = 1
 
-SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+DISABLED_SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/config.mk
 
diff --git a/uriloader/exthandler/tests/moz.build b/uriloader/exthandler/tests/moz.build
index b9707821144c..824337c9834a 100644
--- a/uriloader/exthandler/tests/moz.build
+++ b/uriloader/exthandler/tests/moz.build
@@ -17,3 +17,8 @@ if CONFIG['OS_ARCH'] != 'Darwin':
 CPP_SOURCES += [
     'WriteArgument.cpp',
 ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (fyl[0:-4], bin_suffix) for fyl in CPP_SOURCES
+]
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index c159c082fb49..17171cb19193 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -41,7 +41,7 @@ cppsrcs += TestSTLWrappers.cpp
 endif
 
 # TODO: Use CPPSRCS from moz.build
-SIMPLE_PROGRAMS	:= $(cppsrcs:.cpp=$(BIN_SUFFIX))
+DISABLED_SIMPLE_PROGRAMS	:= $(cppsrcs:.cpp=$(BIN_SUFFIX))
 
 CPP_UNIT_TESTS = \
                  ShowAlignments.cpp \
diff --git a/xpcom/tests/external/Makefile.in b/xpcom/tests/external/Makefile.in
index 444831f8aa6d..0db888667d35 100644
--- a/xpcom/tests/external/Makefile.in
+++ b/xpcom/tests/external/Makefile.in
@@ -9,7 +9,7 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+DISABLED_SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpcom/tests/external/moz.build b/xpcom/tests/external/moz.build
index 2322c4c0e689..5a3513d2f7e8 100644
--- a/xpcom/tests/external/moz.build
+++ b/xpcom/tests/external/moz.build
@@ -10,3 +10,6 @@ CPP_SOURCES += [
     'TestMinStringAPI.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    fyl[0:-4] for fyl in CPP_SOURCES
+]
diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build
index ea3f5a2c62cd..7e81ee8450eb 100644
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -45,3 +45,9 @@ CPP_SOURCES += [
     'TestUnicodeArguments.cpp',
     'nsIFileEnumerator.cpp',
 ]
+
+programs = [
+    fyl[0:-4] for fyl in CPP_SOURCES
+]
+programs.sort()
+SIMPLE_PROGRAMS += programs