Merge pull request #15214 from ladislas/ladislas/bugfix/mbed_assert_no_throw

0xc0170 · web-flow · commit 9e2c9498ccfb · 2022-01-31T10:24:51.000+01:00
Allow unit tests to be compiled with -fno-exception
diff --git a/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp b/platform/tests/UNITTESTS/doubles/mbed_assert_stub.cpp
@@ -26,7 +26,11 @@ extern "C" void mbed_assert_internal(const char *expr, const char *file, int lin
 {
     fprintf(stderr, "mbed assertation failed: %s, file: %s, line %d \n", expr, file, line);
     if (mbed_assert_throw_errors) {
+#ifdef __EXCEPTIONS
         throw 1;
+#else
+        FAIL();
+#endif
     }
 
     /* Ensure we fail the unit test if the Mbed assertion fails. Without this,

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,11 @@ extern "C" void mbed_assert_internal(const char expr, const char file, int lin`
`26`	`26`	`{`
`27`	`27`	`fprintf(stderr, "mbed assertation failed: %s, file: %s, line %d \n", expr, file, line);`
`28`	`28`	`if (mbed_assert_throw_errors) {`
	`29`	`+#ifdef __EXCEPTIONS`
`29`	`30`	`throw 1;`
	`31`	`+#else`
	`32`	`+ FAIL();`
	`33`	`+#endif`
`30`	`34`	`}`
`31`	`35`
`32`	`36`	`/* Ensure we fail the unit test if the Mbed assertion fails. Without this,`