Improve testing and output

Author: fjtrujy

CMakeLists.txt

@@ -11,4 +11,17 @@ enable_testing()
 
 add_subdirectory(src)
 
+if(BUILD_TESTING)
+  add_subdirectory(test)
+  # Ensure invoking the test target compiles the app first
+  if(TARGET test)
+    add_dependencies(test masp)
+  endif()
+  # Provide a convenient 'check' target that builds and runs tests
+  add_custom_target(check
+    COMMAND ${CMAKE_CTEST_COMMAND} -C $<CONFIG> --output-on-failure
+    DEPENDS masp
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+  )
+endif()
 

cmake/RunMaspAndCompare.cmake

@@ -62,13 +62,4 @@ if(MINGW)
   target_link_libraries(masp PRIVATE gnurx)
 endif()
 
-# Tests
-if(BUILD_TESTING)
-  add_test(NAME masp_vu1Triangle
-    COMMAND ${CMAKE_COMMAND}
-      -Dmasp_exe=$<TARGET_FILE:masp>
-      -Dsrc=${CMAKE_SOURCE_DIR}/test/vu1Triangle.vcl
-      -Dexpected=${CMAKE_SOURCE_DIR}/test/vu1Triangle.vcl_masp
-      -Dout=${CMAKE_BINARY_DIR}/test_outputs/vu1Triangle.vcl_masp
-      -P ${CMAKE_SOURCE_DIR}/cmake/RunMaspAndCompare.cmake)
-endif()
+# Tests are defined in test/CMakeLists.txt

src/CMakeLists.txt

@@ -0,0 +1,4 @@
+# C unit tests
+add_subdirectory(unit)
+
+

test/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Minimal C unit test that calls masp's main in-process to avoid CLI parsing issues
+
+add_executable(test_masp_cli
+  ${CMAKE_SOURCE_DIR}/test/unit/test_masp_cli.c
+  ${CMAKE_SOURCE_DIR}/src/hash.c
+  ${CMAKE_SOURCE_DIR}/src/macro.c
+  ${CMAKE_SOURCE_DIR}/src/sb.c
+  ${CMAKE_SOURCE_DIR}/src/compat.c
+)
+
+target_include_directories(test_masp_cli PRIVATE ${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR}/src)
+
+target_compile_definitions(test_masp_cli PRIVATE
+  SRC_DIR="${CMAKE_SOURCE_DIR}"
+  BUILD_DIR="${CMAKE_BINARY_DIR}"
+  PACKAGE_VERSION="test"
+  REPORT_BUGS_TO="ci"
+  LOCALEDIR=""
+)
+
+add_test(NAME masp_cli_unit COMMAND test_masp_cli)
+
+# Windows (MinGW) needs POSIX regex library (libgnurx)
+if(MINGW)
+  target_link_libraries(test_masp_cli PRIVATE gnurx)
+endif()
+
+

test/unit/CMakeLists.txt

@@ -0,0 +1,136 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <errno.h>
+#ifdef _WIN32
+#include <direct.h>
+#define MKDIR(p) _mkdir(p)
+#else
+#include <sys/types.h>
+#include <unistd.h>
+#include <sys/wait.h>
+#define MKDIR(p) mkdir((p), 0777)
+#endif
+
+#ifndef SRC_DIR
+#define SRC_DIR "."
+#endif
+#ifndef BUILD_DIR
+#define BUILD_DIR "."
+#endif
+
+// Avoid symbol clash: rename masp main before including the implementation
+#define main masp_program_main
+#include "../../src/masp.c"
+#undef main
+
+static int files_equal(const char *a, const char *b) {
+  FILE *fa = fopen(a, "rb");
+  FILE *fb = fopen(b, "rb");
+  if (!fa || !fb) { if (fa) fclose(fa); if (fb) fclose(fb); return 0; }
+  int eq = 1;
+  const size_t BUFSZ = 8192;
+  unsigned char *ba = (unsigned char*)malloc(BUFSZ);
+  unsigned char *bb = (unsigned char*)malloc(BUFSZ);
+  if (!ba || !bb) { eq = 0; goto done; }
+  size_t ra, rb;
+  do {
+    ra = fread(ba, 1, BUFSZ, fa);
+    rb = fread(bb, 1, BUFSZ, fb);
+    if (ra != rb || memcmp(ba, bb, ra) != 0) { eq = 0; break; }
+  } while (ra > 0 && rb > 0);
+done:
+  if (ba) free(ba);
+  if (bb) free(bb);
+  fclose(fa);
+  fclose(fb);
+  return eq;
+}
+
+static int run_vu1Triangle(void) {
+  char out_path[1024];
+  char src_path[1024];
+  char expected_path[1024];
+  char out_dir[1024];
+  snprintf(out_path, sizeof(out_path), "%s/test_outputs/masp_vu1Triangle.unit.out", BUILD_DIR);
+  snprintf(src_path, sizeof(src_path), "%s/test/vu1Triangle.vcl", SRC_DIR);
+  snprintf(expected_path, sizeof(expected_path), "%s/test/vu1Triangle.vcl_masp", SRC_DIR);
+
+  // Ensure output directory exists (CI may not have it yet)
+  snprintf(out_dir, sizeof(out_dir), "%s/test_outputs", BUILD_DIR);
+  if (MKDIR(out_dir) != 0 && errno != EEXIST) {
+    fprintf(stderr, "Failed to create output dir: %s (errno=%d)\n", out_dir, errno);
+    return 1;
+  }
+
+  int rc = 0;
+#if defined(__unix__)
+  const char *force_inproc = getenv("MASP_TEST_INPROC");
+  if (!force_inproc || strcmp(force_inproc, "1") != 0) {
+    // Prefer a clean subprocess exec on UNIX to avoid sanitizer/locale clashes on CI
+    char masp_path[1024];
+    snprintf(masp_path, sizeof(masp_path), "%s/src/masp", BUILD_DIR);
+    pid_t pid = fork();
+    if (pid == 0) {
+      const char *argvp[] = { masp_path, "-p", "-s", "-c", ";", "-o", out_path, "--", src_path, NULL };
+      execv(masp_path, (char* const*)argvp);
+      _exit(127);
+    } else if (pid > 0) {
+      int status = 0;
+      if (waitpid(pid, &status, 0) < 0) {
+        perror("waitpid");
+        return 1;
+      }
+      if (!WIFEXITED(status)) {
+        fprintf(stderr, "masp subprocess terminated abnormally\n");
+        return 1;
+      }
+      rc = WEXITSTATUS(status);
+    } else {
+      perror("fork");
+      return 1;
+    }
+  } else
+#endif
+  {
+    const char *argv0[] = {
+      "masp",
+      "-p",
+      "-s",
+      "-c", ";",
+      "-o", out_path,
+      "--", src_path,
+      NULL
+    };
+    int argc = 9;
+    rc = masp_program_main(argc, (char**)argv0);
+  }
+  if (rc != 0) {
+    fprintf(stderr, "masp_program_main returned %d\n", rc);
+    return 1;
+  }
+  struct stat st;
+  if (stat(out_path, &st) != 0) {
+    fprintf(stderr, "Output file not created: %s\n", out_path);
+    return 1;
+  }
+  if (!files_equal(out_path, expected_path)) {
+    fprintf(stderr, "Output differs from expected: %s\n", out_path);
+    return 1;
+  }
+  return 0;
+}
+
+int main(void) {
+  int failures = 0;
+  failures += run_vu1Triangle();
+  if (failures) {
+    fprintf(stderr, "Unit tests failed: %d\n", failures);
+    return 1;
+  }
+  printf("All unit tests passed.\n");
+  return 0;
+}
+
+