Commonize unit test main()

CL: none

PUBLISHED_FROM=ee76407d89f3fcbe3da23810117a374d06af0a25

Author: Deomid Ryabkov

common/test_util.h

@@ -27,7 +27,7 @@
 extern "C" {
 #endif
 
-extern int num_tests;
+extern int g_num_tests;
 
 #ifdef MG_TEST_ABORT_ON_FAIL
 #define MG_TEST_ABORT abort()
@@ -48,7 +48,7 @@ void _strfail(const char *a, const char *e, int len);
 
 #define ASSERT(expr)                    \
   do {                                  \
-    num_tests++;                        \
+    g_num_tests++;                      \
     if (!(expr)) FAIL(#expr, __LINE__); \
   } while (0)
 #define ASSERT_TRUE(expr) ASSERT(expr)
@@ -71,7 +71,6 @@ void _strfail(const char *a, const char *e, int len);
       elapsed = cs_time() - elapsed;               \
       printf("  [%.3f] %s\n", elapsed, test_name); \
       fflush(stdout);                              \
-      *total_elapsed += elapsed;                   \
     }                                              \
     if (msg) return msg;                           \
   } while (0)
@@ -89,7 +88,7 @@ void _strfail(const char *a, const char *e, int len);
  */
 #define ASSERT_EQ(actual, expected)                                 \
   do {                                                              \
-    num_tests++;                                                    \
+    g_num_tests++;                                                  \
     if (!((actual) == (expected))) {                                \
       printf("%f != %f\n", AS_DOUBLE(actual), AS_DOUBLE(expected)); \
       FAIL(#actual " == " #expected, __LINE__);                     \
@@ -99,7 +98,7 @@ void _strfail(const char *a, const char *e, int len);
 /* "Less than" assertion. */
 #define ASSERT_LT(a, b)                                 \
   do {                                                  \
-    num_tests++;                                        \
+    g_num_tests++;                                      \
     if (!((a) < (b))) {                                 \
       printf("%f >= %f\n", AS_DOUBLE(a), AS_DOUBLE(b)); \
       FAIL(#a " < " #b, __LINE__);                      \
@@ -109,7 +108,7 @@ void _strfail(const char *a, const char *e, int len);
 /* "Greater than" assertion. */
 #define ASSERT_GT(a, b)                                 \
   do {                                                  \
-    num_tests++;                                        \
+    g_num_tests++;                                      \
     if (!((a) > (b))) {                                 \
       printf("%f <= %f\n", AS_DOUBLE(a), AS_DOUBLE(b)); \
       FAIL(#a " > " #b, __LINE__);                      \
@@ -119,7 +118,7 @@ void _strfail(const char *a, const char *e, int len);
 /* Assert that actual == expected, where both are NUL-terminated. */
 #define ASSERT_STREQ(actual, expected)                            \
   do {                                                            \
-    num_tests++;                                                  \
+    g_num_tests++;                                                \
     if (!_assert_streq(actual, expected)) {                       \
       FAIL("ASSERT_STREQ(" #actual ", " #expected ")", __LINE__); \
     }                                                             \
@@ -128,7 +127,7 @@ void _strfail(const char *a, const char *e, int len);
 /* Assert that actual == expected, where both are pointers */
 #define ASSERT_PTREQ(actual, expected)                            \
   do {                                                            \
-    num_tests++;                                                  \
+    g_num_tests++;                                                \
     if (actual != expected) {                                     \
       printf("%p != %p\n", actual, expected);                     \
       FAIL("ASSERT_PTREQ(" #actual ", " #expected ")", __LINE__); \
@@ -138,7 +137,7 @@ void _strfail(const char *a, const char *e, int len);
 /* Assert that actual != expected, where both are pointers */
 #define ASSERT_PTRNEQ(actual, expected)                            \
   do {                                                             \
-    num_tests++;                                                   \
+    g_num_tests++;                                                 \
     if (actual == expected) {                                      \
       printf("%p == %p\n", actual, expected);                      \
       FAIL("ASSERT_PTRNEQ(" #actual ", " #expected ")", __LINE__); \
@@ -148,15 +147,15 @@ void _strfail(const char *a, const char *e, int len);
 /* Same as STREQ, but only expected is NUL-terminated. */
 #define ASSERT_STREQ_NZ(actual, expected)                            \
   do {                                                               \
-    num_tests++;                                                     \
+    g_num_tests++;                                                   \
     if (!_assert_streq_nz(actual, expected)) {                       \
       FAIL("ASSERT_STREQ_NZ(" #actual ", " #expected ")", __LINE__); \
     }                                                                \
   } while (0)
 
 #define ASSERT_MG_STREQ(actual, expected)                            \
   do {                                                               \
-    num_tests++;                                                     \
+    g_num_tests++;                                                   \
     if ((actual).len != strlen(expected) ||                          \
         memcmp((actual).p, expected, (actual).len) != 0) {           \
       printf("'%.*s' (%d) != '%s'\n", (int)(actual).len, (actual).p, \

mjs/Makefile

@@ -51,7 +51,8 @@ PROG = $(BUILD_DIR)/mjs
 all: $(PROG)
 
 TESTUTIL_FILES = $(REPO_ROOT)/common/cs_dirent.c \
-                 $(REPO_ROOT)/common/cs_time.c \
+                 $(REPO_ROOT)/common/cs_time.c   \
+                 $(REPO_ROOT)/common/test_main.c \
                  $(REPO_ROOT)/common/test_util.c
 
 mjs.c: $(TOP_SOURCES) mjs.h Makefile

mjs/tests/unit_test.c

@@ -11,6 +11,7 @@ extern "C" {
 #define STRINGIFY(x) #x
 #define MJS_ENABLE_DEBUG 1
 #include "common/cs_dirent.h"
+#include "common/test_main.h"
 #include "common/test_util.h"
 #include "mjs.c"
 
@@ -3767,9 +3768,10 @@ const char *test_parser(struct mjs *mjs) {
   return NULL;
 }
 
-static const char *run_all_tests(const char *filter, double *total_elapsed) {
-  cs_log_set_level(2);
+void tests_setup(void) {
+}
 
+const char *tests_run(const char *filter) {
   RUN_TEST_MJS(test_parser);
   RUN_TEST_MJS(test_arithmetic);
   RUN_TEST_MJS(test_block);
@@ -3820,11 +3822,7 @@ static const char *run_all_tests(const char *filter, double *total_elapsed) {
   return NULL;
 }
 
-int main(void) {
-  double seconds = 0.0;
-  const char *msg = run_all_tests("", &seconds);
-  printf("%s, run %d in %.3fs\n", msg ? "FAIL" : "PASS", num_tests, seconds);
-  return msg == NULL ? EXIT_SUCCESS : EXIT_FAILURE;
+void tests_teardown(void) {
 }
 
 #if defined(__cplusplus)