From 018be96174f92286300e33ba2132dc37794abc32 Mon Sep 17 00:00:00 2001
From: "L. David Baron" <dbaron@dbaron.org>
Date: Tue, 10 Feb 2009 14:05:28 -0800
Subject: [PATCH] TestHarness.h should give errors with TEST-UNEXPECTED-FAIL. 
 (Bug 477512)  r=jwalden

---
 xpcom/tests/TestHarness.h | 6 +++---
 xpcom/tests/TestPipe.cpp  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xpcom/tests/TestHarness.h b/xpcom/tests/TestHarness.h
index 1127a6d180d..3fd7964fdc1 100644
--- a/xpcom/tests/TestHarness.h
+++ b/xpcom/tests/TestHarness.h
@@ -55,14 +55,14 @@
 
 /**
  * Prints the given failure message and arguments using printf, prepending
- * "FAIL " for the benefit of the test harness and appending "\n" to eliminate
- * having to type it at each call site.
+ * "TEST-UNEXPECTED-FAIL " for the benefit of the test harness and
+ * appending "\n" to eliminate having to type it at each call site.
  */
 void fail(const char* msg, ...)
 {
   va_list ap;
 
-  printf("FAIL ");
+  printf("TEST-UNEXPECTED-FAIL | ");
 
   va_start(ap, msg);
   vprintf(msg, ap);
diff --git a/xpcom/tests/TestPipe.cpp b/xpcom/tests/TestPipe.cpp
index 2ebcb7b412e..9605ddd747d 100644
--- a/xpcom/tests/TestPipe.cpp
+++ b/xpcom/tests/TestPipe.cpp
@@ -204,7 +204,7 @@ nsresult TestBackwardsAllocator()
                    SEGMENT_SIZE, SEGMENT_COUNT, allocator); 
   if (NS_FAILED(rv))
   {
-    printf("FAIL TP_NewPipe2 failed: %x\n", rv);
+    fail("TP_NewPipe2 failed: %x", rv);
     return rv;
   }