Backed out changeset b5c0c5b2a6d4 (bug 872086) for Windows bustage.

CLOSED TREE

mozglue/tests/Makefile.in

@@ -10,7 +10,7 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 ifdef MOZ_LINKER
-DISABLE_SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX)
+SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX)
 NO_DIST_INSTALL = 1
 STL_FLAGS =
 

mozglue/tests/moz.build

@@ -8,6 +8,3 @@ if CONFIG['MOZ_LINKER']:
     CPP_SOURCES += [
         'TestZip.cpp',
     ]
-    SIMPLE_PROGRAMS += [
-        'TestZip%s' % CONFIG['BIN_SUFFIX'],
-    ]

toolkit/mozapps/update/test/Makefile.in

@@ -33,7 +33,7 @@ cppsrcs = \
   $(NULL)
 
 # TODO: Base off of CPP_SOURCES in moz.build
-DISABLED_SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
 
 INI_TEST_FILES = \
   TestAUSReadStrings1.ini \

toolkit/mozapps/update/test/moz.build

@@ -12,10 +12,3 @@ 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

uriloader/exthandler/tests/Makefile.in

@@ -12,7 +12,7 @@ include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS = 1
 
-DISABLED_SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/config.mk
 

uriloader/exthandler/tests/moz.build

@@ -17,8 +17,3 @@ 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
-]

xpcom/tests/Makefile.in

@@ -41,7 +41,7 @@ cppsrcs += TestSTLWrappers.cpp
 endif
 
 # TODO: Use CPPSRCS from moz.build
-DISABLED_SIMPLE_PROGRAMS	:= $(cppsrcs:.cpp=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS	:= $(cppsrcs:.cpp=$(BIN_SUFFIX))
 
 CPP_UNIT_TESTS = \
                  ShowAlignments.cpp \

xpcom/tests/external/Makefile.in

@@ -9,7 +9,7 @@ VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DISABLED_SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/rules.mk
 

xpcom/tests/external/moz.build

@@ -10,6 +10,3 @@ CPP_SOURCES += [
     'TestMinStringAPI.cpp',
 ]
 
-SIMPLE_PROGRAMS += [
-    fyl[0:-4] for fyl in CPP_SOURCES
-]

xpcom/tests/moz.build

@@ -45,9 +45,3 @@ CPP_SOURCES += [
     'TestUnicodeArguments.cpp',
     'nsIFileEnumerator.cpp',
 ]
-
-programs = [
-    fyl[0:-4] for fyl in CPP_SOURCES
-]
-programs.sort()
-SIMPLE_PROGRAMS += programs