Fixed greentea tests

Author: evedon

TESTS/mbed_drivers/c_strings/main.cpp

@@ -116,14 +116,15 @@ Case cases[] = {
     Case("C strings: %u %d integer formatting", test_case_c_string_u_d, greentea_failure_handler),
     Case("C strings: %x %E integer formatting", test_case_c_string_x_X, greentea_failure_handler),
 #if !defined(__NEWLIB_NANO)
-    //In build tools, GCC with Newlib-nano linker option "-u _printf_float" is not configured
-    //to enable printf floating format. So disabling floating format test case.
+    // Newlib-nano linker option "-u _printf_float" is not set to enable floating point support.
+#if (defined(MBED_MINIMAL_PRINTF) && MBED_CONF_PLATFORM_MINIMAL_PRINTF_ENABLE_FLOATING_POINT) || !defined(MBED_MINIMAL_PRINTF)
     Case("C strings: %f %f float formatting", test_case_c_string_f_f, greentea_failure_handler),
+#endif
 #ifndef MBED_MINIMAL_PRINTF
     Case("C strings: %e %E float formatting", test_case_c_string_e_E, greentea_failure_handler),
     Case("C strings: %g %g float formatting", test_case_c_string_g_g, greentea_failure_handler),
-#endif
-#endif
+#endif // MBED_MINIMAL_PRINTF
+#endif // !defined(__NEWLIB_NANO)
 };
 
 utest::v1::status_t greentea_test_setup(const size_t number_of_cases)

TESTS/mbed_drivers/watchdog_reset/main.cpp

@@ -92,7 +92,7 @@ bool send_reset_notification(testcase_data *tcdata, uint32_t delay_ms)
 {
     char msg_value[12];
     int str_len = snprintf(msg_value, sizeof msg_value, "%02x,%08lx", tcdata->start_index + tcdata->index, delay_ms);
-    if (str_len != (sizeof msg_value) - 1) {
+    if (str_len < 0) {
         utest_printf("Failed to compose a value string to be sent to host.");
         return false;
     }

TESTS/mbed_hal/watchdog_reset/main.cpp

@@ -90,7 +90,7 @@ bool send_reset_notification(testcase_data *tcdata, uint32_t delay_ms)
 {
     char msg_value[12];
     int str_len = snprintf(msg_value, sizeof msg_value, "%02x,%08lx", tcdata->start_index + tcdata->index, delay_ms);
-    if (str_len != (sizeof msg_value) - 1) {
+    if (str_len < 0) {
         utest_printf("Failed to compose a value string to be sent to host.");
         return false;
     }

TESTS/mbed_hal/watchdog_timing/main.cpp

@@ -59,7 +59,7 @@ bool send_reset_notification(testcase_data *tcdata, uint32_t delay_ms)
 {
     char msg_value[12];
     int str_len = snprintf(msg_value, sizeof msg_value, "%02x,%08lx", tcdata->start_index + tcdata->index, delay_ms);
-    if (str_len != (sizeof msg_value) - 1) {
+    if (str_len < 0) {
         utest_printf("Failed to compose a value string to be sent to host.");
         return false;
     }
@@ -110,7 +110,7 @@ void test_timing()
 
         int str_len = snprintf(msg_value, sizeof msg_value, "%02x,%08lx", current_case.start_index + current_case.index,
                                (uint32_t) current_ts);
-        if (str_len != (sizeof msg_value) - 1) {
+        if (str_len < 0) {
             utest_printf("Failed to compose a value string to be sent to host.");
             return;
         }

platform/source/minimal-printf/mbed_printf_implementation.c

@@ -1,5 +1,6 @@
 /* mbed Microcontroller Library
- * Copyright (c) 2017 ARM Limited
+ * Copyright (c) 2017-2020 ARM Limited
+ * SPDX-License-Identifier: Apache-2.0
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -121,17 +122,22 @@ static void mbed_minimal_putchar(char *buffer, size_t length, int *result, char
 {
     /* only continue if 'result' doesn't overflow */
     if ((*result >= 0) && (*result <= INT_MAX - 1)) {
-        /* write data only if there's enough space */
-        if ((size_t)*result < length) {
-            if (buffer) {
+        if (buffer) {
+            /* write data only if there's enough space */
+            if ((size_t)*result < length) {
                 buffer[*result] = data;
+            }
+
+            /* increment 'result' even if data was not written. This ensures that
+               'mbed_minimal_formatted_string' returns the correct value. */
+            *result += 1;
+        } else {
+            if (fputc(data, stream) == EOF) {
+                *result = EOF;
             } else {
-                fputc(data, stream);
+                *result += 1;
             }
         }
-        /* increment 'result' even if data was not written. This ensures that
-           'mbed_minimal_formatted_string' returns the correct value. */
-        *result += 1;
     }
 }