EXIT_TEST macro added for cleaner implementation and maintenance

testsuite/testsuite.c

@@ -210,11 +210,7 @@ int testsuite_test(int argc, char** argv)
 #endif /* HAVE_WNR */
 
     printf("\nAll tests passed!\n");
-#ifdef WOLFSSL_RIOT_OS
+    EXIT_TEST(EXIT_SUCCESS);
-    exit(0);
-#else
-    return EXIT_SUCCESS;
-#endif
 }
 
 void simple_test(func_args* args)
@@ -415,11 +411,8 @@ int main(int argc, char** argv)
     if (server_args.return_code != 0) return server_args.return_code;
 
     printf("\nAll tests passed!\n");
-#ifdef WOLFSSL_RIOT_OS
+
-    exit(0);
+    EXIT_TEST(EXIT_SUCCESS);
-#else
-    return EXIT_SUCCESS;
-#endif
 }
 
 

wolfcrypt/benchmark/benchmark.c

@@ -483,11 +483,7 @@ int benchmark_test(void *args)
     ShowMemoryTracker();
 #endif
 
-#ifdef WOLFSSL_RIOT_OS
+    EXIT_TEST(0);
-    exit (0);
-#else
-    return 0;
-#endif
 }
 
 

wolfcrypt/test/test.c

@@ -262,11 +262,8 @@ static int err_sys(const char* msg, int es)
 
 {
     printf("%s error = %d\n", msg, es);
-#ifdef WOLFSSL_RIOT_OS
+
-    exit(-1);
+    EXIT_TEST(-1);
-#else
-    return -1; /* error state */
-#endif
 }
 
 /* func_args from test.h, so don't have to pull in other junk */
@@ -733,11 +730,7 @@ int wolfcrypt_test(void* args)
             err_sys("Failed to free netRandom context", -1238);
 #endif /* HAVE_WNR */
 
-#ifdef WOLFSSL_RIOT_OS
+        EXIT_TEST(args.return_code);
-        exit(0);
-#else
-        return args.return_code;
-#endif
     }
 
 #endif /* NO_MAIN_DRIVER */

wolfssl/wolfcrypt/types.h

@@ -407,6 +407,11 @@
         #endif
     #endif /* WOLFSSL_AESNI or WOLFSSL_ARMASM */
 
+    #ifdef WOLFSSL_RIOT_OS
+        #define EXIT_TEST(ret) exit(ret)
+    #else
+        #define EXIT_TEST(ret) return ret
+    #endif
 
 	#ifdef __cplusplus
 	    }   /* extern "C" */