commit d396f62aaab6dad5a1184c18ecccaac529be3f87
author Laurence Lundblade <lgl@securitytheory.com> Sat Jan 12 17:12:29 2019 -0800
committer Laurence Lundblade <lgl@securitytheory.com> Sat Jan 12 17:12:29 2019 -0800
tree dc8dc15576bf5d2ac4a7a753d846fe6b8d56f954
parent 10346b6c3f89c55f8f9bee2df76e0a0b9831b731

Make RunTest() handle newlines in a portable way

Rather than just outputting \n for a newline, there
is now a way the caller of RunTest() to implement
newline however they want, for example using \r\n
on Windows and \n Linux.

test/run_tests.c

diff --git a/test/run_tests.c b/test/run_tests.c
index 0297de9..c2816ba 100644
--- a/test/run_tests.c
+++ b/test/run_tests.c
@@ -202,19 +202,19 @@
         const char * szTestResult = (t2->test_fun)();
         nTestsRun++;
         if(pfOutput) {
-            (*pfOutput)(t2->szTestName, poutCtx);
+            (*pfOutput)(t2->szTestName, poutCtx, 0);
         }
 
         if(szTestResult) {
             if(pfOutput) {
-                (*pfOutput)(" FAILED (returned ", poutCtx);
-                (*pfOutput)(szTestResult, poutCtx);
-                (*pfOutput)(")\n", poutCtx);
+                (*pfOutput)(" FAILED (returned ", poutCtx, 0);
+                (*pfOutput)(szTestResult, poutCtx, 0);
+                (*pfOutput)(")\n", poutCtx, 1);
             }
             nTestsFailed++;
         } else {
             if(pfOutput) {
-                (*pfOutput)( " PASSED\n", poutCtx);
+                (*pfOutput)( " PASSED", poutCtx, 1);
             }
         }
     }
@@ -248,19 +248,19 @@
         int nTestResult = (t->test_fun)();
         nTestsRun++;
         if(pfOutput) {
-            (*pfOutput)(t->szTestName, poutCtx);
+            (*pfOutput)(t->szTestName, poutCtx, 0);
         }
 
         if(nTestResult) {
             if(pfOutput) {
-                (*pfOutput)(" FAILED (returned ", poutCtx);
-                (*pfOutput)(NumToString(nTestResult, StringStorage), poutCtx);
-                (*pfOutput)(")\n", poutCtx);
+                (*pfOutput)(" FAILED (returned ", poutCtx, 0);
+                (*pfOutput)(NumToString(nTestResult, StringStorage), poutCtx, 0);
+                (*pfOutput)(")", poutCtx, 1);
             }
             nTestsFailed++;
         } else {
             if(pfOutput) {
-                (*pfOutput)( " PASSED\n", poutCtx);
+                (*pfOutput)( " PASSED", poutCtx, 1);
             }
         }
     }
@@ -270,11 +270,11 @@
     }
 
     if(pfOutput) {
-        (*pfOutput)( "SUMMARY: ", poutCtx);
-        (*pfOutput)( NumToString(nTestsRun, StringStorage), poutCtx);
-        (*pfOutput)( " tests run; ", poutCtx);
-        (*pfOutput)( NumToString(nTestsFailed, StringStorage), poutCtx);
-        (*pfOutput)( " tests failed\n", poutCtx);
+        (*pfOutput)( "SUMMARY: ", poutCtx, 0);
+        (*pfOutput)( NumToString(nTestsRun, StringStorage), poutCtx, 0);
+        (*pfOutput)( " tests run; ", poutCtx, 0);
+        (*pfOutput)( NumToString(nTestsFailed, StringStorage), poutCtx, 0);
+        (*pfOutput)( " tests failed", poutCtx, 1);
     }
 
     return nTestsFailed;
@@ -285,24 +285,24 @@
 
 static void PrintSize(const char *szWhat, uint32_t uSize, OutputStringCB pfOutput, void *pOutCtx)
 {
-    UsefulBuf_MAKE_STACK_UB(foo, 20);
+   UsefulBuf_MAKE_STACK_UB(buffer, 20);
 
-    (*pfOutput)(szWhat, pOutCtx);
-    (*pfOutput)(" ", pOutCtx);
-    (*pfOutput)(NumToString(uSize,foo), pOutCtx);
-    (*pfOutput)("\n", pOutCtx);
+   (*pfOutput)(szWhat, pOutCtx, 0);
+   (*pfOutput)(" ", pOutCtx, 0);
+   (*pfOutput)(NumToString(uSize, buffer), pOutCtx, 0);
+   (*pfOutput)("", pOutCtx, 1);
 }
 
 void PrintSizes(OutputStringCB pfOutput, void *pOutCtx)
 {
-    // Type and size of return from sizeof() varies. These will never be large so cast is safe
-    PrintSize("sizeof(QCBORTrackNesting)", (uint32_t)sizeof(QCBORTrackNesting), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBOREncodeContext)", (uint32_t)sizeof(QCBOREncodeContext), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBORDecodeNesting)", (uint32_t)sizeof(QCBORDecodeNesting), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBORDecodeContext)", (uint32_t)sizeof(QCBORDecodeContext), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBORItem)", (uint32_t)sizeof(QCBORItem), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBORStringAllocator)", (uint32_t)sizeof(QCBORStringAllocator), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBORTagListIn)", (uint32_t)sizeof(QCBORTagListIn), pfOutput, pOutCtx);
-    PrintSize("sizeof(QCBORTagListOut)", (uint32_t)sizeof(QCBORTagListOut), pfOutput, pOutCtx);
-    (*pfOutput)("\n", pOutCtx);
+   // Type and size of return from sizeof() varies. These will never be large so cast is safe
+   PrintSize("sizeof(QCBORTrackNesting)",   (uint32_t)sizeof(QCBORTrackNesting), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBOREncodeContext)",  (uint32_t)sizeof(QCBOREncodeContext), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBORDecodeNesting)",  (uint32_t)sizeof(QCBORDecodeNesting), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBORDecodeContext)",  (uint32_t)sizeof(QCBORDecodeContext), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBORItem)",           (uint32_t)sizeof(QCBORItem), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBORStringAllocator)",(uint32_t)sizeof(QCBORStringAllocator), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBORTagListIn)",      (uint32_t)sizeof(QCBORTagListIn), pfOutput, pOutCtx);
+   PrintSize("sizeof(QCBORTagListOut)",     (uint32_t)sizeof(QCBORTagListOut), pfOutput, pOutCtx);
+   (*pfOutput)("", pOutCtx, 1);
 }