2 files changed, 20 insertions, 11 deletions
diff --git a/src/include/usr/cxxtest/TestSuite.H b/src/include/usr/cxxtest/TestSuite.H
index 5674bf164..e3fa332d1 100755
--- a/src/include/usr/cxxtest/TestSuite.H
+++ b/src/include/usr/cxxtest/TestSuite.H
@@ -65,13 +65,18 @@ public:
 
 class AbortTest {};
 
-void doTrace( void );
-void doWarn( const char *file, unsigned line, const char *message );
-void doFailTest( const char *file, unsigned line, const char *message );
-void doFailAssert( const char *file, unsigned line, const char *expression, const char *message );
+void doTrace( );
+void doWarn( );
+void doFailTest( );
+void doFailTest( const char *filename, uint32_t linenum );
+void doFailAssert(  const char *file,
+                    unsigned line,
+                    const char *expression,
+                    const char *message );
 
 
-void        reportTotalTests( const char *suitename, uint64_t numtests );
+void reportTotalTests(  const char *suitename,
+                        uint64_t numtests );
 
 extern uint64_t g_ModulesCompleted;
 
@@ -85,16 +90,18 @@ extern uint64_t g_ModulesCompleted;
 #define _TS_CATCH_ABORT(b)
 
 // TS_TRACE
-#define  TS_TRACE(...)   TRACDCOMP( g_trac_test, __VA_ARGS__); CxxTest::doTrace()
+#define  TS_TRACE(...)  TRACDCOMP( g_trac_test, "TS_TRACE> "__VA_ARGS__ );           \
+    CxxTest::doTrace( )
 
 
 // TS_WARN
-#define _TS_WARN(f,l,e) CxxTest::doWarn( (f), (l), e )
-#define TS_WARN(e) _TS_WARN( __FILE__, __LINE__, e )
+#define TS_WARN(...)    TRACDCOMP( g_trac_test, "!TS_WARN> " __VA_ARGS__ ); \
+    CxxTest::doWarn( )
+
 
 // TS_FAIL
-#define _TS_FAIL(f,l,e) CxxTest::doFailTest( (f), (l), e )
-#define TS_FAIL(e) _TS_FAIL( __FILE__, __LINE__, e )
+#define TS_FAIL(...)    TRACDCOMP( g_trac_test, "!!!TS_FAIL> " __VA_ARGS__); \
+    CxxTest::doFailTest( __FILE__, __LINE__ )
 
 }
 
diff --git a/src/include/usr/trace/interface.H b/src/include/usr/trace/interface.H
index 84c2e5217..432b69648 100644
--- a/src/include/usr/trace/interface.H
+++ b/src/include/usr/trace/interface.H
@@ -7,7 +7,7 @@
  * 
  *  IBM HostBoot Licensed Internal Code
  * 
- *  (C) Copyright IBM Corp. 2011
+ *  (C) Copyright IBM Corp. 2004 - 2011
  * 
  *  The source code for this program is not published or other-
  *  wise divested of its trade secrets, irrespective of what has
@@ -45,6 +45,8 @@
 #define ENTER_MRK ">>"
 #define EXIT_MRK  "<<"
 #define ERR_MRK   "E>"
+#define FAIL_MRK  "F>"
+#define WARN_MRK  "W>"
 #define INFO_MRK  "I>"
 #define ARG_MRK   "A>"