From 010bc19a3c0a894a6dfed04a907c0588d8e5bdd1 Mon Sep 17 00:00:00 2001
From: Serge Gautherie <sgautherie.bz@free.fr>
Date: Wed, 8 Oct 2008 02:27:05 +0200
Subject: [PATCH] Bug 457046 - Decide what to do with <TestPipes.cpp> |#if
 0|'ed code; Bv1; r=benjamin

---
 xpcom/io/nsSegmentedBuffer.cpp | 2 +-
 xpcom/tests/Makefile.in        | 4 ++--
 xpcom/tests/TestPipes.cpp      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xpcom/io/nsSegmentedBuffer.cpp b/xpcom/io/nsSegmentedBuffer.cpp
index f6a1c15d347..b910980cab2 100644
--- a/xpcom/io/nsSegmentedBuffer.cpp
+++ b/xpcom/io/nsSegmentedBuffer.cpp
@@ -167,7 +167,7 @@ nsSegmentedBuffer::Empty()
     mFirstSegmentIndex = mLastSegmentIndex = 0;
 }
 
-#ifdef DEBUG
+#if !defined(MOZ_ENABLE_LIBXUL) && defined(DEBUG)
 NS_COM void
 TestSegmentedBuffer()
 {
diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in
index b869b2fb2a5..6dea4642fbc 100644
--- a/xpcom/tests/Makefile.in
+++ b/xpcom/tests/Makefile.in
@@ -77,6 +77,7 @@ CPPSRCS		= \
 		TestVersionComparator.cpp \
 		TestTextFormatter.cpp \
 		TestPipe.cpp \
+		TestPipes.cpp \
 		TestRacingServiceManager.cpp \
 		TestRegistrationOrder.cpp \
 		TestProxies.cpp \
@@ -94,7 +95,6 @@ CPPSRCS += \
 		TestCRT.cpp \
 		TestEncoding.cpp \
 		TestPermanentAtoms.cpp \
-		TestPipes.cpp \
 		TestThreads.cpp \
 		TestThreadPool.cpp \
 		TestXPIDLString.cpp \
@@ -142,6 +142,7 @@ CPP_UNIT_TESTS = \
   TestID \
   TestObserverService \
   TestPipe \
+  TestPipes \
   TestRacingServiceManager \
   TestServMgr \
   TestTextFormatter \
@@ -156,7 +157,6 @@ CPP_UNIT_TESTS += \
   TestCRT \
   TestEncoding \
   TestExpirationTracker \
-  TestPipes \
   TestProxies \
   TestThreads \
   TestThreadPool \
diff --git a/xpcom/tests/TestPipes.cpp b/xpcom/tests/TestPipes.cpp
index 7415be34262..7635fc1d88c 100644
--- a/xpcom/tests/TestPipes.cpp
+++ b/xpcom/tests/TestPipes.cpp
@@ -512,7 +512,7 @@ TestSearch(const char* delim, PRUint32 segSize)
 #endif
 ////////////////////////////////////////////////////////////////////////////////
 
-#ifdef DEBUG
+#if !defined(MOZ_ENABLE_LIBXUL) && defined(DEBUG)
 extern NS_COM void
 TestSegmentedBuffer();
 #endif
@@ -529,7 +529,7 @@ main(int argc, char* argv[])
     if (argc > 1 && nsCRT::strcmp(argv[1], "-trace") == 0)
         gTrace = PR_TRUE;
 
-#ifdef DEBUG
+#if !defined(MOZ_ENABLE_LIBXUL) && defined(DEBUG)
     printf("Testing segmented buffer...\n");
     TestSegmentedBuffer();
 #endif