From e4b2a0f558f49f24bf31f763c13027ebcabc5efa Mon Sep 17 00:00:00 2001 From: CamVan Nguyen Date: Mon, 29 Aug 2011 10:18:55 -0500 Subject: Added %c and precision formatting support to trace. Added TRACSCOMP macros. Change-Id: If697b4d988a238b5cd06229853dded20bd0af3c1 Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/286 Tested-by: Jenkins Server Reviewed-by: Andrew J. Geissler --- src/usr/trace/test/tracetest.H | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) (limited to 'src/usr/trace/test') diff --git a/src/usr/trace/test/tracetest.H b/src/usr/trace/test/tracetest.H index a68b6ccae..e574f55c5 100644 --- a/src/usr/trace/test/tracetest.H +++ b/src/usr/trace/test/tracetest.H @@ -71,7 +71,19 @@ public: // Do a debug trace TRACDCOMP(g_trac_test,"This is a debug trace"); - // Need to run a formatting test, but I know it will fail. + // Do an strace + TRACSCOMP(g_trac_test, "STRACE: Testing all number types (c,u,X,d,s): %c %u 0x%X %d %s", + 'b',i,i+1,i+2,"Hostboot"); + + // Test formatting + TRACFCOMP(g_trac_test, "Test width.precision formatting (u,x,X,d): %8u 0x%.06x 0x%16X %01.01d", + 0xABCD,0x1234,0x123456789ABCDEF0,0x12345678); + + TRACFCOMP(g_trac_test, "Test width.precision.length formatting (u,x,X,d): %8hu 0x%.06lx 0x%16LX %01.01lld", + 0xABCD,0x1234,0x123456789ABCDEF0,0x12345678); + + TRACFCOMP(g_trac_test, "Test width.precision.length formatting (u,x,X,i): %8hu 0x%.06lx 0x%16LX %01.01lli", + 0xABCD,0x1234,0x123456789ABCDEF0,0x12345678AB); } // Be sure a NULL trace descriptor does not cause a failure @@ -86,7 +98,7 @@ public: void testTracBinary(void) { trace_desc_t *g_trac_test = NULL; - TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLE", 4096); + TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLEBIN", 4096); if(g_trac_test == NULL) { @@ -119,7 +131,7 @@ public: void testTracMix(void) { trace_desc_t *g_trac_test = NULL; - TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLE", 4096); + TRAC_INIT_BUFFER(&g_trac_test, "EXAMPLEMIX", 4096); if(g_trac_test == NULL) { @@ -201,6 +213,14 @@ public: DTRAC_ERR("Testing Debug Error Mark"); DTRAC_EXIT("testTracMacros - Debug Trace"); DTRAC_EXIT_(" - Debug Trace"); + + STRAC_ENTER("testTracMacros - Strace"); + STRAC_ENTER_(" - Strace"); + STRAC_INF("Testing Strace Info Mark"); + STRAC_ERR("Testing Strace Error Mark"); + STRAC_EXIT("testTracMacros - Strace"); + STRAC_EXIT_(" - Strace"); + } #undef __COMP_FN__ -- cgit v1.2.1