Bug 930350 - Fix --enable-ipdl-tests build. r=gps. DONTBUILD because NPOTB
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 25 Oct 2013 08:39:45 +0900
changeset 165852 748863923653a6d0856f0347c59f0a212dbd808a
parent 165851 88c6e28f4acdb2ad3580ed90c483e2f85c78db71
child 165853 27e42f27f03a681c97507bde448f87b0dd0f8530
push id3066
push userakeybl@mozilla.com
push dateMon, 09 Dec 2013 19:58:46 +0000
treeherdermozilla-beta@a31a0dce83aa [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs930350
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 930350 - Fix --enable-ipdl-tests build. r=gps. DONTBUILD because NPOTB
ipc/ipdl/test/cxx/Makefile.in
ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
ipc/ipdl/test/cxx/moz.build
--- a/ipc/ipdl/test/cxx/Makefile.in
+++ b/ipc/ipdl/test/cxx/Makefile.in
@@ -1,55 +1,21 @@
 # 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/.
 
-IPDLTESTS = \
-  TestActorPunning \
-  TestBridgeMain \
-  TestCrashCleanup \
-  TestDataStructures \
-  TestDesc \
-  TestFailedCtor \
-  TestHangs \
-  TestJSON \
-  TestLatency \
-  TestManyChildAllocs  \
-  TestMultiMgrs  \
-  TestNestedLoops \
-  TestOpens \
-  TestInterruptErrorCleanup \
-  TestInterruptRaces \
-  TestInterruptShutdownRace \
-  TestRPC \
-  TestRaceDeferral \
-  TestRacyReentry  \
-  TestRacyInterruptReplies  \
-  TestRacyUndefer \
-  TestSanity  \
-  TestSelfManageRoot \
-  TestShmem \
-  TestShutdown \
-  TestStackHooks \
-  TestSyncError \
-  TestSyncHang \
-  TestSyncWakeup \
-  TestBadActor \
-  TestUrgency \
-  $(NULL)
+IPDLTESTSRCS = $(filter Test%,$(CPPSRCS))
+IPDLTESTS = $(IPDLTESTSRCS:.cpp=)
 
-ifeq ($(OS_ARCH),Linux)
-IPDLTESTS += TestSysVShmem
-endif
+CPPSRCS += IPDLUnitTests.cpp
 
 EXTRA_PROTOCOLS = \
   TestBridgeSub \
   $(NULL)
 
-IPDLTESTSRCS = $(addsuffix .cpp,$(IPDLTESTS))
 IPDLTESTHDRS = $(addprefix $(srcdir)/,$(addsuffix .h,$(IPDLTESTS)))
 
 TESTER_TEMPLATE := $(srcdir)/IPDLUnitTests.template.cpp
 GENTESTER := $(srcdir)/genIPDLUnitTests.py
 
 include $(topsrcdir)/config/rules.mk
 
 
--- a/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
+++ b/ipc/ipdl/test/cxx/PTestBridgeMain.ipdl
@@ -1,8 +1,9 @@
+include protocol PTestBridgeMainSub;
 include protocol PTestBridgeSub;
 
 namespace mozilla {
 namespace _ipdltest {
 
 
 protocol PTestBridgeMain {
     child spawns PTestBridgeSub;
--- a/ipc/ipdl/test/cxx/moz.build
+++ b/ipc/ipdl/test/cxx/moz.build
@@ -12,19 +12,56 @@ LIBRARY_NAME = 'ipdlunittest_s'
 EXPORTS.mozilla._ipdltest += [
     'IPDLUnitTestProcessChild.h',
     'IPDLUnitTests.h',
     'IPDLUnitTestTypes.h',
     'IPDLUnitTestUtils.h',
 ]
 
 SOURCES += [
-    '$(IPDLTESTSRCS)',
+    'TestActorPunning.cpp',
+    'TestBadActor.cpp',
+    'TestBridgeMain.cpp',
+    'TestCrashCleanup.cpp',
+    'TestDataStructures.cpp',
+    'TestDesc.cpp',
+    'TestFailedCtor.cpp',
+    'TestHangs.cpp',
+    'TestInterruptErrorCleanup.cpp',
+    'TestInterruptRaces.cpp',
+    'TestInterruptShutdownRace.cpp',
+    'TestJSON.cpp',
+    'TestLatency.cpp',
+    'TestManyChildAllocs.cpp',
+    'TestMultiMgrs.cpp',
+    'TestNestedLoops.cpp',
+    'TestOpens.cpp',
+    'TestRaceDeferral.cpp',
+    'TestRacyInterruptReplies.cpp',
+    'TestRacyReentry.cpp',
+    'TestRacyUndefer.cpp',
+    'TestRPC.cpp',
+    'TestSanity.cpp',
+    'TestSelfManageRoot.cpp',
+    'TestShmem.cpp',
+    'TestShutdown.cpp',
+    'TestStackHooks.cpp',
+    'TestSyncError.cpp',
+    'TestSyncHang.cpp',
+    'TestSyncWakeup.cpp',
+    'TestUrgency.cpp',
+]
+
+if CONFIG['OS_ARCH'] == 'Linux':
+    SOURCES += [
+        'TestSysVShmem.cpp',
+    ]
+
+SOURCES += [
     'IPDLUnitTestProcessChild.cpp',
-    'IPDLUnitTests.cpp',
     'IPDLUnitTestSubprocess.cpp',
 ]
 
 IPDL_SOURCES += [
     'PTestActorPunning.ipdl',
     'PTestActorPunningPunned.ipdl',
     'PTestActorPunningSub.ipdl',
     'PTestBadActor.ipdl',