From 1ebdbed0b426fa4cf1edf5d9e6fd7e6b20d007bc Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Wed, 24 Jul 2013 09:23:06 +0200 Subject: [PATCH] Bug 888643 - Part b: Move CPP_UNIT_TESTS definitions into moz.build files; r=gps --- content/base/test/Makefile.in | 8 --- content/base/test/moz.build | 7 +++ content/canvas/compiledtest/Makefile.in | 4 -- content/canvas/compiledtest/moz.build | 4 ++ .../media/webaudio/compiledtest/Makefile.in | 4 -- content/media/webaudio/compiledtest/moz.build | 4 ++ dom/audiochannel/tests/Makefile.in | 4 -- dom/audiochannel/tests/moz.build | 4 ++ editor/txmgr/tests/Makefile.in | 2 - editor/txmgr/tests/moz.build | 4 ++ intl/lwbrk/tests/Makefile.in | 2 - intl/lwbrk/tests/moz.build | 4 ++ media/mtransport/test/Makefile.in | 18 ------ media/mtransport/test/moz.build | 15 +++++ media/webrtc/signaling/test/Makefile.in | 7 --- media/webrtc/signaling/test/moz.build | 7 +++ mfbt/tests/Makefile.in | 22 ------- mfbt/tests/moz.build | 19 ++++++ netwerk/test/Makefile.in | 5 -- netwerk/test/moz.build | 6 ++ startupcache/test/Makefile.in | 2 - startupcache/test/moz.build | 4 ++ storage/test/Makefile.in | 26 -------- storage/test/moz.build | 22 +++++++ .../components/places/tests/cpp/Makefile.in | 4 -- toolkit/components/places/tests/cpp/moz.build | 4 ++ widget/tests/Makefile.in | 2 - widget/tests/moz.build | 5 ++ xpcom/tests/Makefile.in | 63 ------------------- xpcom/tests/moz.build | 63 +++++++++++++++++++ xpcom/tests/windows/Makefile.in | 8 --- xpcom/tests/windows/moz.build | 4 ++ 32 files changed, 176 insertions(+), 181 deletions(-) diff --git a/content/base/test/Makefile.in b/content/base/test/Makefile.in index 0b5ec03fb521f..d233a116d97c6 100644 --- 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 index 22c8c8dd34736..eb440c97508b3 100644 --- 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 index fa869191e56b7..2baa1df286698 100644 --- 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 index 895d11993cfbb..0f7f947625229 100644 --- 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 index c6a260a8bbfc3..ca8cc642cb8fc 100644 --- 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 index 895d11993cfbb..8d38be629e9ab 100644 --- 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 index 3ae3d5557f023..0659b8375711a 100644 --- 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 index f0a612a32de6f..35da34275eab0 100644 --- 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 index 58da45154f548..dcdbd0d6102c9 100644 --- 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 index 895d11993cfbb..727b18a4f491a 100644 --- 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 index 2f5f2ada87cbe..ebac014046344 100644 --- 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 index 895d11993cfbb..640e4c2fe712a 100644 --- 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 index b9da7416dea62..ae58aba394e83 100644 --- 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 index 43019784c4dab..4fd84d59ac96c 100644 --- 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 index 075430e00657b..174f29146cb17 100644 --- 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 index 7b107b73ae6f9..e3274cf5b1809 100644 --- 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 index 40b86aa3864ef..fab82648a7177 100644 --- 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 index 895d11993cfbb..e57d43d4f2c93 100644 --- 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 index be1a728982b3d..b89ffcefdc3cd 100644 --- 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 index 5fa67702c16ec..d2fa7615b711d 100644 --- 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 index dab3d6725bcb5..5b4bf3e9ff875 100644 --- 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 index b5bdfd679ea89..5bbd30003f7c5 100644 --- 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 index ab383ef784051..fc444cdf5b225 100644 --- 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 index 069738ecfdd5a..863e1c010c645 100644 --- 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 index 6ec2122e7f6a4..4b4ffa22ee5f7 100644 --- 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 index 4edbbdd77b31e..2d7b3630ef767 100644 --- 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 index fa587a22b873b..2c47fcc61b1fa 100644 --- 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 index 9bd05e4013cf3..6bd1dfbc649f7 100644 --- 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', +] + diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 49e760d0828c7..71c143037f5ac 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -43,69 +43,6 @@ endif # TODO: Use CPPSRCS from moz.build SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX)) -CPP_UNIT_TESTS = \ - ShowAlignments.cpp \ - ShowSSEConfig.cpp \ - TestAutoPtr.cpp \ - TestAutoRef.cpp \ - TestCOMArray.cpp \ - TestCOMPtr.cpp \ - TestCOMPtrEq.cpp \ - TestDeque.cpp \ - TestFile.cpp \ - TestHashtables.cpp \ - TestID.cpp \ - TestObserverArray.cpp \ - TestObserverService.cpp \ - TestPipe.cpp \ - TestRefPtr.cpp \ - TestTextFormatter.cpp \ - TestTArray.cpp \ - $(NULL) - -ifdef MOZ_MEMORY -CPP_UNIT_TESTS += TestJemalloc.cpp -endif - -# XXX Make this tests work in libxul builds. -#CPP_UNIT_TESTS += \ -# TestArray.cpp \ -# TestCRT.cpp \ -# TestEncoding.cpp \ -# TestExpirationTracker.cpp \ -# TestPipes.cpp \ -# TestPriorityQueue.cpp \ -# TestStorageStream.cpp \ -# TestStrings.cpp \ -# TestSynchronization.cpp \ -# TestTArray.cpp \ -# TestThreadPool.cpp \ -# TestThreads.cpp \ -# TestTimeStamp.cpp \ -# TestXPIDLString.cpp \ -# TestUTF.cpp \ -# TestAtoms.cpp \ -# $(NULL) -## FIXME: bug 577500 TestStaticAtoms fails when run in dist/bin -## TestStaticAtoms.cpp - -ifdef MOZ_DEBUG -# FIXME bug 523392: TestDeadlockDetector doesn't like Windows -# FIXME bug 523378: also fails on OS X -ifneq (,$(filter-out WINNT Darwin,$(OS_ARCH))) -CPP_UNIT_TESTS += \ - TestDeadlockDetector.cpp \ - TestDeadlockDetectorScalability.cpp \ - $(NULL) -endif -endif - -ifndef MOZILLA_INTERNAL_API -CPP_UNIT_TESTS += \ - TestStringAPI.cpp \ - $(NULL) -endif - include $(topsrcdir)/config/config.mk LIBS += $(XPCOM_LIBS) diff --git a/xpcom/tests/moz.build b/xpcom/tests/moz.build index a55f0a20d6e26..33bd8a6733829 100644 --- a/xpcom/tests/moz.build +++ b/xpcom/tests/moz.build @@ -49,3 +49,66 @@ CPP_SOURCES += [ 'TestUnicodeArguments.cpp', 'nsIFileEnumerator.cpp', ] + +CPP_UNIT_TESTS += [ + 'ShowAlignments.cpp', + 'ShowSSEConfig.cpp', + 'TestAutoPtr.cpp', + 'TestAutoRef.cpp', + 'TestCOMArray.cpp', + 'TestCOMPtr.cpp', + 'TestCOMPtrEq.cpp', + 'TestDeque.cpp', + 'TestFile.cpp', + 'TestHashtables.cpp', + 'TestID.cpp', + 'TestObserverArray.cpp', + 'TestObserverService.cpp', + 'TestPipe.cpp', + 'TestRefPtr.cpp', + 'TestTArray.cpp', + 'TestTextFormatter.cpp', +] + +if CONFIG['MOZ_MEMORY']: + CPP_UNIT_TESTS += [ + 'TestJemalloc.cpp', + ] + +# XXX Make these tests work in libxul builds. +#CPP_UNIT_TESTS += [ +# 'TestArray.cpp', +# 'TestCRT.cpp', +# 'TestEncoding.cpp', +# 'TestExpirationTracker.cpp', +# 'TestPipes.cpp', +# 'TestPriorityQueue.cpp', +# 'TestStorageStream.cpp', +# 'TestStrings.cpp', +# 'TestSynchronization.cpp', +# 'TestTArray.cpp', +# 'TestThreadPool.cpp', +# 'TestThreads.cpp', +# 'TestTimeStamp.cpp', +# 'TestXPIDLString.cpp', +# 'TestUTF.cpp', +# 'TestAtoms.cpp', +#] + +# FIXME: bug 577500 TestStaticAtoms fails when run in dist/bin +#CPP_UNIT_TESTS += [ +# 'TestStaticAtoms.cpp', +#] + +if CONFIG['MOZ_DEBUG'] and CONFIG['OS_ARCH'] not in ('WINNT', 'Darwin'): + # FIXME bug 523392: TestDeadlockDetector doesn't like Windows + # FIXME bug 523378: also fails on OS X + CPP_UNIT_TESTS += [ + 'TestDeadlockDetector.cpp', + 'TestDeadlockDetectorScalability.cpp', + ] + +if not CONFIG['MOZILLA_INTERNAL_API']: + CPP_UNIT_TESTS += [ + 'TestStringAPI.cpp', + ] diff --git a/xpcom/tests/windows/Makefile.in b/xpcom/tests/windows/Makefile.in index ce20f1ff6a8c2..ebac9f2c46797 100644 --- a/xpcom/tests/windows/Makefile.in +++ b/xpcom/tests/windows/Makefile.in @@ -10,14 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CPP_UNIT_TESTS = \ - TestCOM.cpp \ - $(NULL) - -# TestNTFSPermissions is causing oranges because it's creating directories -# multiple times, and then leaving them in a state where they can't be cleaned -#CPP_UNIT_TESTS += TestNTFSPermissions.cpp - include $(topsrcdir)/config/rules.mk OS_LIBS += $(call EXPAND_LIBNAME,rpcrt4 uuid) diff --git a/xpcom/tests/windows/moz.build b/xpcom/tests/windows/moz.build index 6834f25b09ea0..87d42ffaab2c4 100644 --- a/xpcom/tests/windows/moz.build +++ b/xpcom/tests/windows/moz.build @@ -6,3 +6,7 @@ MODULE = 'xpcom' +CPP_UNIT_TESTS += [ + 'TestCOM.cpp', +] +