Bug 888643 - Part b: Move CPP_UNIT_TESTS definitions into moz.build f…

…iles; r=gps
Brli · Jul 24, 2013 · 1ebdbed · 1ebdbed
1 parent d90ce88
commit 1ebdbed
Show file tree

Hide file tree

Showing 32 changed files with 176 additions and 181 deletions.
diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in
@@ -11,14 +11,6 @@ relativesrcdir  = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPP_UNIT_TESTS = \
-                 TestNativeXMLHttpRequest.cpp \
-                 TestGetURL.cpp \
-                 TestPlainTextSerializer.cpp \
-                 $(NULL)
-
-# Split files arbitrarily in three groups to not run into too-long command lines
-# which break on Windows (see bug 563151 and bug 831989)
 MOCHITEST_FILES_A = \
 		responseIdentical.sjs \
 		test_bug5141.html \

diff --git a/content/base/test/moz.build b/content/base/test/moz.build
@@ -13,3 +13,10 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 # 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_UNIT_TESTS += [
+    'TestGetURL.cpp',
+    'TestNativeXMLHttpRequest.cpp',
+    'TestPlainTextSerializer.cpp',
+]
+
diff --git a/content/canvas/compiledtest/Makefile.in b/content/canvas/compiledtest/Makefile.in
@@ -15,8 +15,4 @@ LOCAL_INCLUDES := \
   -I$(srcdir)/../src \
   $(NULL)
 
-CPP_UNIT_TESTS := \
-  TestWebGLElementArrayCache.cpp \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/content/canvas/compiledtest/moz.build b/content/canvas/compiledtest/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+CPP_UNIT_TESTS += [
+    'TestWebGLElementArrayCache.cpp',
+]
+
diff --git a/content/media/webaudio/compiledtest/Makefile.in b/content/media/webaudio/compiledtest/Makefile.in
@@ -14,8 +14,4 @@ FAIL_ON_WARNINGS = 1
 
 LOCAL_INCLUDES := -I$(srcdir)/..
 
-CPP_UNIT_TESTS := \
-  TestAudioEventTimeline.cpp \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/content/media/webaudio/compiledtest/moz.build b/content/media/webaudio/compiledtest/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+CPP_UNIT_TESTS += [
+    'TestAudioEventTimeline.cpp',
+]
+
diff --git a/dom/audiochannel/tests/Makefile.in b/dom/audiochannel/tests/Makefile.in
@@ -12,9 +12,5 @@ include $(DEPTH)/config/autoconf.mk
 
 FAIL_ON_WARNINGS = 1
 
-CPP_UNIT_TESTS = \
-		TestAudioChannelService.cpp \
-		$(NULL)
-
 include $(topsrcdir)/config/rules.mk
 
diff --git a/dom/audiochannel/tests/moz.build b/dom/audiochannel/tests/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'dom'
 
+CPP_UNIT_TESTS += [
+    'TestAudioChannelService.cpp',
+]
+
diff --git a/editor/txmgr/tests/Makefile.in b/editor/txmgr/tests/Makefile.in
@@ -12,6 +12,4 @@ FAIL_ON_WARNINGS = 1
 include $(DEPTH)/config/autoconf.mk
 
 
-CPP_UNIT_TESTS = TestTXMgr.cpp
-
 include $(topsrcdir)/config/rules.mk
diff --git a/editor/txmgr/tests/moz.build b/editor/txmgr/tests/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+CPP_UNIT_TESTS += [
+    'TestTXMgr.cpp',
+]
+
diff --git a/intl/lwbrk/tests/Makefile.in b/intl/lwbrk/tests/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPP_UNIT_TESTS	= TestLineBreak.cpp
-
 include $(topsrcdir)/config/rules.mk
 
 LOCAL_INCLUDES	= -I$(srcdir)/../public
diff --git a/intl/lwbrk/tests/moz.build b/intl/lwbrk/tests/moz.build
@@ -4,3 +4,7 @@
 # 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/.
 
+CPP_UNIT_TESTS += [
+    'TestLineBreak.cpp',
+]
+
diff --git a/media/mtransport/test/Makefile.in b/media/mtransport/test/Makefile.in
@@ -103,22 +103,4 @@ DEFINES += \
   $(NULL)
 endif
 
-ifneq ($(OS_TARGET),WINNT)
-ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
-CPP_UNIT_TESTS = \
-  ice_unittest.cpp \
-  nrappkit_unittest.cpp \
-  sockettransportservice_unittest.cpp \
-  transport_unittests.cpp \
-  runnable_utils_unittest.cpp \
-  turn_unittest.cpp \
-  TestSyncRunnable.cpp \
-  $(NULL)
-ifdef MOZ_SCTP
-CPP_UNIT_TESTS += sctp_unittest.cpp
-endif
-
-endif
-endif
-
 include $(topsrcdir)/config/rules.mk
diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build
@@ -6,3 +6,18 @@
 
 MODULE = 'test_mtransport'
 
+if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+    CPP_UNIT_TESTS += [
+        'TestSyncRunnable.cpp',
+        'ice_unittest.cpp',
+        'nrappkit_unittest.cpp',
+        'runnable_utils_unittest.cpp',
+        'sockettransportservice_unittest.cpp',
+        'transport_unittests.cpp',
+        'turn_unittest.cpp',
+    ]
+
+    if CONFIG['MOZ_SCTP']:
+        CPP_UNIT_TESTS += [
+            'sctp_unittest.cpp',
+        ]
diff --git a/media/webrtc/signaling/test/Makefile.in b/media/webrtc/signaling/test/Makefile.in
@@ -148,13 +148,6 @@ ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 ifdef JS_SHARED_LIBRARY
 LIBS += $(MOZ_ZLIB_LIBS)
 endif
-
-CPP_UNIT_TESTS = \
-  sdp_unittests.cpp \
-  signaling_unittests.cpp \
-  mediapipeline_unittest.cpp \
-  mediaconduit_unittests.cpp \
-  $(NULL)
 endif
 endif
 

diff --git a/media/webrtc/signaling/test/moz.build b/media/webrtc/signaling/test/moz.build
@@ -6,3 +6,10 @@
 
 MODULE = 'test_signaling'
 
+if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+    CPP_UNIT_TESTS += [
+        'mediaconduit_unittests.cpp',
+        'mediapipeline_unittest.cpp',
+        'sdp_unittests.cpp',
+        'signaling_unittests.cpp',
+    ]
diff --git a/mfbt/tests/Makefile.in b/mfbt/tests/Makefile.in
@@ -11,28 +11,6 @@ include $(DEPTH)/config/autoconf.mk
 
 STL_FLAGS =
 
-CPP_UNIT_TESTS = \
-  TestAtomics.cpp \
-  TestBloomFilter.cpp \
-  TestCasting.cpp \
-  TestCeilingFloor.cpp \
-  TestCheckedInt.cpp \
-  TestCountZeroes.cpp \
-  TestEndian.cpp \
-  TestEnumSet.cpp \
-  TestFloatingPoint.cpp \
-  TestSHA1.cpp \
-  TestTypeTraits.cpp \
-  TestWeakPtr.cpp \
-  $(NULL)
-
-# These tests don't work with AddressSanitizer enabled
-ifndef MOZ_ASAN
-CPP_UNIT_TESTS += \
-  TestPoisonArea.cpp \
-  $(NULL)
-endif
-
 # in order to prevent rules.mk from trying to link to libraries that are
 # not available to MFBT, we have to reset these MOZ_GLUE*_LDFLAGS before including it
 # and LIBS_ after including it. For WRAP_LDFLAGS, it shouldn't matter.

diff --git a/mfbt/tests/moz.build b/mfbt/tests/moz.build
@@ -4,3 +4,22 @@
 # 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/.
 
+CPP_UNIT_TESTS += [
+    'TestAtomics.cpp',
+    'TestBloomFilter.cpp',
+    'TestCasting.cpp',
+    'TestCeilingFloor.cpp',
+    'TestCheckedInt.cpp',
+    'TestCountZeroes.cpp',
+    'TestEndian.cpp',
+    'TestEnumSet.cpp',
+    'TestFloatingPoint.cpp',
+    'TestSHA1.cpp',
+    'TestTypeTraits.cpp',
+    'TestWeakPtr.cpp',
+]
+
+if not CONFIG['MOZ_ASAN']:
+    CPP_UNIT_TESTS += [
+        'TestPoisonArea.cpp',
+    ]
diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in
@@ -46,11 +46,6 @@ DISABLED_SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX))
 #		TestUDPSocketProvider$(BIN_SUFFIX) \
 #		$(NULL)
 
-CPP_UNIT_TESTS = \
-		 TestSTSParser.cpp \
-		 TestUDPServerSocket.cpp \
-		 $(NULL)
-
 include $(topsrcdir)/config/config.mk
 
 LIBS		= $(XPCOM_LIBS) \

diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
@@ -37,3 +37,9 @@ bin_suffix = CONFIG['BIN_SUFFIX']
 SIMPLE_PROGRAMS += [
     "%s%s" % (x[0:-4], bin_suffix) for x in CPP_SOURCES
 ]
+
+CPP_UNIT_TESTS += [
+    'TestSTSParser.cpp',
+    'TestUDPServerSocket.cpp',
+]
+
diff --git a/startupcache/test/Makefile.in b/startupcache/test/Makefile.in
@@ -10,8 +10,6 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPP_UNIT_TESTS = TestStartupCache.cpp
-
 LIBS += $(MOZ_COMPONENT_LIBS)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/startupcache/test/moz.build b/startupcache/test/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'test_startupcache'
 
+CPP_UNIT_TESTS += [
+    'TestStartupCache.cpp',
+]
+
diff --git a/storage/test/Makefile.in b/storage/test/Makefile.in
@@ -11,32 +11,6 @@ relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-CPP_UNIT_TESTS = \
-  test_transaction_helper.cpp \
-  test_statement_scoper.cpp \
-  test_mutex.cpp \
-  test_binding_params.cpp \
-  test_true_async.cpp \
-  test_unlock_notify.cpp \
-  test_service_init_background_thread.cpp \
-  test_AsXXX_helpers.cpp \
-  test_StatementCache.cpp \
-  test_async_callbacks_with_spun_event_loops.cpp \
-  test_file_perms.cpp \
-  test_asyncStatementExecution_transaction.cpp \
-  $(NULL)
-
-ifdef MOZ_DEBUG
-# FIXME bug 523392: test_deadlock_detector doesn't like Windows
-# FIXME bug 523378: also fails on OS X
-ifneq (,$(filter-out WINNT Darwin,$(OS_ARCH)))
-CPP_UNIT_TESTS += \
-  test_deadlock_detector.cpp \
-  $(NULL)
-endif
-endif
-
-
 LOCAL_INCLUDES = \
   -I$(srcdir)/../src \
   $(NULL)

diff --git a/storage/test/moz.build b/storage/test/moz.build
@@ -7,3 +7,25 @@
 MODULE = 'test_storage'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+CPP_UNIT_TESTS += [
+    'test_AsXXX_helpers.cpp',
+    'test_StatementCache.cpp',
+    'test_asyncStatementExecution_transaction.cpp',
+    'test_async_callbacks_with_spun_event_loops.cpp',
+    'test_binding_params.cpp',
+    'test_file_perms.cpp',
+    'test_mutex.cpp',
+    'test_service_init_background_thread.cpp',
+    'test_statement_scoper.cpp',
+    'test_transaction_helper.cpp',
+    'test_true_async.cpp',
+    'test_unlock_notify.cpp',
+]
+
+if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT', 'Darwin'):
+    # FIXME bug 523392: test_deadlock_detector doesn't like Windows
+    # FIXME bug 523378: also fails on OS X
+    CPP_UNIT_TESTS += [
+        'test_deadlock_detector.cpp',
+    ]
diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in
@@ -11,8 +11,4 @@ FAIL_ON_WARNINGS = 1
 
 include $(DEPTH)/config/autoconf.mk
 
-CPP_UNIT_TESTS = \
-  test_IHistory.cpp \
-  $(NULL)
-
 include $(topsrcdir)/config/rules.mk
diff --git a/toolkit/components/places/tests/cpp/moz.build b/toolkit/components/places/tests/cpp/moz.build
@@ -6,3 +6,7 @@
 
 MODULE = 'test_places'
 
+CPP_UNIT_TESTS += [
+    'test_IHistory.cpp',
+]
+
diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in
@@ -26,8 +26,6 @@ endif
 #                 $(NULL)
 endif
 
-CPP_UNIT_TESTS += TestAppShellSteadyState.cpp
-
 MOCHITEST_CHROME_FILES =	test_bug343416.xul \
 		test_bug429954.xul \
 		window_bug429954.xul \

diff --git a/widget/tests/moz.build b/widget/tests/moz.build
@@ -7,3 +7,8 @@
 MODULE = 'test_widget'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
+
+CPP_UNIT_TESTS += [
+    'TestAppShellSteadyState.cpp',
+]
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,6 +12,4 @@ FAIL_ON_WARNINGS = 1
		include $(DEPTH)/config/autoconf.mk


		CPP_UNIT_TESTS = TestTXMgr.cpp

		include $(topsrcdir)/config/rules.mk