Backed out changeset b5c0c5b2a6d4 (bug 872086) for Windows bustage.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 13 Jun 2013 18:33:46 -0400
changeset 142121 2777f9ae3173673661baa5d61a47f152c624df13
parent 142120 0c078f228d84eecce3923b81c6fae8da9517f785
child 142122 31aa900a060b8220a981ddc9484b9dd37b9e7caa
push idunknown
push userunknown
push dateunknown
bugs872086
milestone24.0a1
backs outb5c0c5b2a6d465677535d5365b83fd41637a220d
Backed out changeset b5c0c5b2a6d4 (bug 872086) for Windows bustage. CLOSED TREE
mozglue/tests/Makefile.in
mozglue/tests/moz.build
toolkit/mozapps/update/test/Makefile.in
toolkit/mozapps/update/test/moz.build
uriloader/exthandler/tests/Makefile.in
uriloader/exthandler/tests/moz.build
xpcom/tests/Makefile.in
xpcom/tests/external/Makefile.in
xpcom/tests/external/moz.build
xpcom/tests/moz.build
--- a/mozglue/tests/Makefile.in
+++ b/mozglue/tests/Makefile.in
@@ -5,17 +5,17 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 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 =
 
 LOCAL_INCLUDES += -I$(srcdir)/../linker
 # Only link against the linker, not mozglue
 MOZ_GLUE_PROGRAM_LDFLAGS =
 MOZ_GLUE_LDFLAGS =
 LIBS += $(call EXPAND_LIBNAME_PATH,linker,../linker)
--- a/mozglue/tests/moz.build
+++ b/mozglue/tests/moz.build
@@ -3,11 +3,8 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 if CONFIG['MOZ_LINKER']:
     CPP_SOURCES += [
         'TestZip.cpp',
     ]
-    SIMPLE_PROGRAMS += [
-        'TestZip%s' % CONFIG['BIN_SUFFIX'],
-    ]
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -28,17 +28,17 @@ 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
-DISABLED_SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
+SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX))
 
 INI_TEST_FILES = \
   TestAUSReadStrings1.ini \
   TestAUSReadStrings2.ini \
   TestAUSReadStrings3.ini \
   $(NULL)
 
 LOCAL_INCLUDES += \
--- a/toolkit/mozapps/update/test/moz.build
+++ b/toolkit/mozapps/update/test/moz.build
@@ -7,15 +7,8 @@
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     DIRS += ['chrome']
     CPP_SOURCES += [
         'TestAUSReadStrings.cpp',
         'TestAUSHelper.cpp',
     ]
 
 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
--- a/uriloader/exthandler/tests/Makefile.in
+++ b/uriloader/exthandler/tests/Makefile.in
@@ -7,17 +7,17 @@ topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 relativesrcdir = @relativesrcdir@
 
 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
 
 LIBS +=		\
 		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/uriloader/exthandler/tests/moz.build
+++ b/uriloader/exthandler/tests/moz.build
@@ -12,13 +12,8 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcsh
 
 #FIXME/bug 575918: out-of-process xpcshell is broken on OS X
 if CONFIG['OS_ARCH'] != 'Darwin':
     XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
 
 CPP_SOURCES += [
     'WriteArgument.cpp',
 ]
-
-bin_suffix = CONFIG['BIN_SUFFIX']
-SIMPLE_PROGRAMS += [
-    "%s%s" % (fyl[0:-4], bin_suffix) for fyl in CPP_SOURCES
-]
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -36,17 +36,17 @@ cppsrcs += TestBase64.cpp
 endif
 
 # This can be deleted when SIMPLE_PROGRAMS is in moz.build
 ifdef WRAP_STL_INCLUDES
 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 \
                  ShowSSEConfig.cpp \
                  TestAutoPtr.cpp \
                  TestAutoRef.cpp \
                  TestCOMArray.cpp \
                  TestCOMPtr.cpp \
--- a/xpcom/tests/external/Makefile.in
+++ b/xpcom/tests/external/Makefile.in
@@ -4,16 +4,16 @@
 
 DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 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
 
 LIBS += \
 	$(XPCOM_GLUE_LDOPTS) \
 	$(NSPR_LIBS) \
 	$(NULL)
--- a/xpcom/tests/external/moz.build
+++ b/xpcom/tests/external/moz.build
@@ -5,11 +5,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom'
 
 CPP_SOURCES += [
     'TestMinStringAPI.cpp',
 ]
 
-SIMPLE_PROGRAMS += [
-    fyl[0:-4] for fyl in CPP_SOURCES
-]
--- a/xpcom/tests/moz.build
+++ b/xpcom/tests/moz.build
@@ -40,14 +40,8 @@ CPP_SOURCES += [
     'TestQuickReturn.cpp',
     'TestRacingServiceManager.cpp',
     'TestRegistrationOrder.cpp',
     'TestThreadPoolListener.cpp',
     'TestTimers.cpp',
     'TestUnicodeArguments.cpp',
     'nsIFileEnumerator.cpp',
 ]
-
-programs = [
-    fyl[0:-4] for fyl in CPP_SOURCES
-]
-programs.sort()
-SIMPLE_PROGRAMS += programs