Fix: default random seed might exceed the limit

Author: qgymib

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## v3.0.4
 
+### Fixed
+1. Fix: default random seed might exceed the limit.
+
 ### Features
 1. Automatic disable thread support if `Threads` not found.
 2. Test case can be unregistered by `cutest_unregister_case()`.

include/cutest.h

@@ -115,7 +115,7 @@ extern "C" {
 /**
  * @brief Development version.
  */
-#define CUTEST_VERSION_PREREL       2
+#define CUTEST_VERSION_PREREL       3
 
 /**
  * @brief Ensure the api is exposed as C function.

src/cutest.c

@@ -3081,15 +3081,14 @@ static void _cutest_setup_once(void)
     {
         token = 1;
         _cutest_setup_type();
-        _cutest_srand(1);
     }
 }
 
 static void _cutest_prepare(void)
 {
     cutest_porting_timespec_t seed;
     cutest_porting_clock_gettime(&seed);
-    cutest_porting_srand((unsigned long)seed.tv_sec);
+    _cutest_srand((unsigned long)seed.tv_sec);
 
     g_test_ctx.runtime.tid = cutest_porting_gettid();
     g_test_ctx.counter.repeat.repeat = 1;
@@ -3131,6 +3130,15 @@ static int _cutest_setup_arg_break_on_failure(void)
     return 0;
 }
 
+static void _cutest_cleanup(void)
+{
+	cutest_map_t case_table = g_test_ctx.case_table;
+	cutest_map_t type_table = g_test_ctx.type_table;
+	cutest_porting_memset(&g_test_ctx, 0, sizeof(g_test_ctx));
+	g_test_ctx.case_table = case_table;
+	g_test_ctx.type_table = type_table;
+}
+
 /**
  * @brief Setup test context
  * @param[in] argc      The number of command line argument.
@@ -3170,16 +3178,9 @@ static int _cutest_setup(int argc, char* argv[], FILE* out, const cutest_hook_t*
         continue;\
     } while (0)
 
-    /* Do soft clear. */
-    {
-        cutest_map_t case_table = g_test_ctx.case_table;
-        cutest_map_t type_table = g_test_ctx.type_table;
-        cutest_porting_memset(&g_test_ctx, 0, sizeof(g_test_ctx));
-        g_test_ctx.case_table = case_table;
-        g_test_ctx.type_table = type_table;
-    }
-
     _cutest_setup_once();
+
+    _cutest_cleanup();
     _cutest_prepare();
 
     g_test_ctx.out = out;
@@ -3233,16 +3234,6 @@ static void _cutest_run_all_test_once(void)
     _cutest_show_report(&tv_total_start, &tv_total_end);
 }
 
-static void _cutest_cleanup(void)
-{
-    cutest_porting_memset(&g_test_ctx.runtime, 0, sizeof(g_test_ctx.runtime));
-    cutest_porting_memset(&g_test_ctx.counter, 0, sizeof(g_test_ctx.counter));
-    cutest_porting_memset(&g_test_ctx.mask, 0, sizeof(g_test_ctx.mask));
-    cutest_porting_memset(&g_test_ctx.filter, 0, sizeof(g_test_ctx.filter));
-
-    g_test_ctx.hook = NULL;
-}
-
 static void _cutest_show_information(void)
 {
 #if CUTEST_VERSION_PREREL