fork

Fork of cpputest by Rohit Grover

Files at this revision

API Documentation at this revision

Comitter:
Kojto
Date:
Wed May 13 13:20:35 2015 +0000
Parent:
2:82161d9e7b36
Commit message:
Rename console to mbed_cpputest_console (as in mbed testrunner)

Changed in this revision

src/Platforms/armcc/UtestPlatform.cpp Show annotated file Show diff for this revision Revisions of this file
diff -r 82161d9e7b36 -r 9e8c8907d9ee src/Platforms/armcc/UtestPlatform.cpp
--- a/src/Platforms/armcc/UtestPlatform.cpp	Thu Jun 19 08:24:31 2014 +0100
+++ b/src/Platforms/armcc/UtestPlatform.cpp	Wed May 13 13:20:35 2015 +0000
@@ -202,18 +202,18 @@
      * Serial object connected to the console. */
 #define NEED_TEST_REPORT_AS_CONSOLE_OUTPUT 1
 #if NEED_TEST_REPORT_AS_CONSOLE_OUTPUT
-    extern Serial console;
+    extern Serial mbed_cpputest_console;
 
     #define NEED_LINE_FEED_IN_ADDITION_TO_NEWLINE 1
     #if NEED_LINE_FEED_IN_ADDITION_TO_NEWLINE
     /* CppUTest emits \n line terminators in its reports; some terminals
      * need the linefeed (\r) in addition. */
     if (c == '\n') {
-        console.putc('\r');
+        mbed_cpputest_console.putc('\r');
     }
     #endif /* #if NEED_LINE_FEED_IN_ADDITION_TO_NEWLINE */
 
-    return (console.putc(c));
+    return (mbed_cpputest_console.putc(c));
 #else /* NEED_TEST_REPORT_AS_CONSOLE_OUTPUT */
     return (0);
 #endif /* NEED_TEST_REPORT_AS_CONSOLE_OUTPUT */