updated CMakeLists for tests and test files to fix tests with manual zlib header file

Author: nick

.gitignore

@@ -7,6 +7,6 @@
 BUILDING.md
 /.vscode
 /build
-/dist
 .pypirc
-/build_mingw64
+/build_mingw64
+/build_msvc

dist/docx_comment_parser-1.1.1-cp314-cp314-win_amd64.whl

@@ -1,20 +1,13 @@
 # =============================================================================
 # tests/CMakeLists.txt
-#
-# Builds and registers the self-contained docx_comment_parser test suite.
-# Invoked automatically by the parent CMakeLists when BUILD_TESTS=ON (default).
-#
-# Usage:
-#   cmake -B build -DBUILD_TESTS=ON
-#   cmake --build build
-#   ctest --test-dir build --output-on-failure
 # =============================================================================
 
 cmake_minimum_required(VERSION 3.15)
 
-# ─── zlib is needed by the test's own ZIP builder (uses crc32/inflate) ────────
-# On MSVC the vendored zlib.h is used (same as zip_reader.cpp).
-# On Linux/macOS/MinGW we link the system libz.
+# ─── zlib ────────────────────────────────────────────────────────────────────
+# On MSVC: crc32 body is compiled into the test TU via VENDOR_ZLIB_IMPLEMENTATION;
+#          no library link needed.
+# On Linux / macOS / MinGW: link the system libz.
 if(NOT MSVC)
   find_package(ZLIB REQUIRED)
 endif()
@@ -24,7 +17,6 @@ add_executable(test_docx_parser
     test_docx_parser.cpp
 )
 
-# Inherit C++17 from parent; make it explicit here as a safety net
 set_target_properties(test_docx_parser PROPERTIES
     CXX_STANDARD          17
     CXX_STANDARD_REQUIRED ON
@@ -33,52 +25,85 @@ set_target_properties(test_docx_parser PROPERTIES
 
 target_include_directories(test_docx_parser
     PRIVATE
-        # Public headers of the library under test
         ${CMAKE_SOURCE_DIR}/include
-        # Vendor dir: test_docx_parser.cpp includes vendor/zlib/zlib.h on MSVC
         $<$<CXX_COMPILER_ID:MSVC>:${CMAKE_SOURCE_DIR}/vendor>
 )
 
 target_link_libraries(test_docx_parser
     PRIVATE
-        # The shared library being tested (provides docx:: API)
         docx_comment_parser
-        # zlib — crc32() is called by the in-memory ZIP builder in the test.
-        # On MSVC the vendored header is used; no link step is needed there.
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:ZLIB::ZLIB>
 )
 
 target_compile_options(test_docx_parser PRIVATE
     $<$<CXX_COMPILER_ID:GNU,Clang>:-Wall -Wextra -Wpedantic>
-    # Debug build: keep symbols for readable stack traces
-    $<$<CONFIG:Debug>:-g -O0>
-    # Release build: full optimisation, suppress debug info
-    $<$<CONFIG:Release>:-O2 -DNDEBUG>
+    $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:GNU,Clang>>:-g -O0>
+    $<$<AND:$<CONFIG:Release>,$<CXX_COMPILER_ID:GNU,Clang>>:-O2 -DNDEBUG>
 )
 
-# ─── CTest registration ───────────────────────────────────────────────────────
-# One test entry per logical group so CTest can report them individually.
-# All groups are driven by the single binary; the binary's own main() returns
-# non-zero on any failure, which CTest treats as a test failure.
+# ─── Windows DLL placement ────────────────────────────────────────────────────
+# The runtime loader searches the exe's own directory first.  Copy our DLL
+# there so the test runs without any extra PATH setup.
+if(WIN32)
+    add_custom_command(TARGET test_docx_parser POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:docx_comment_parser>
+            $<TARGET_FILE_DIR:test_docx_parser>
+        COMMENT "Copying docx_comment_parser DLL next to test executable"
+        VERBATIM
+    )
+
+    # On MinGW: also copy zlib1.dll (runtime dependency of our DLL) and
+    # pre-resolve the compiler bin dir for use in ENVIRONMENT_MODIFICATION below.
+    if(MINGW)
+        get_filename_component(_mingw_bin "${CMAKE_CXX_COMPILER}" DIRECTORY)
+
+        find_file(_zlib1_dll
+            NAMES zlib1.dll
+            HINTS "${_mingw_bin}"
+            NO_DEFAULT_PATH
+        )
+        if(_zlib1_dll)
+            add_custom_command(TARGET test_docx_parser POST_BUILD
+                COMMAND ${CMAKE_COMMAND} -E copy_if_different
+                    "${_zlib1_dll}"
+                    $<TARGET_FILE_DIR:test_docx_parser>
+                COMMENT "Copying zlib1.dll next to test executable"
+                VERBATIM
+            )
+        endif()
+    endif()
+endif()
 
+# ─── CTest registration ───────────────────────────────────────────────────────
 add_test(
     NAME    DocxParser.BasicParsing
     COMMAND test_docx_parser
 )
 
-# Working directory: project root so that relative paths (e.g. sample .docx
-# files placed there in future) resolve correctly.
 set_tests_properties(DocxParser.BasicParsing PROPERTIES
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
-    # Fail the test if it takes more than 30 seconds (catches infinite loops)
     TIMEOUT           30
-    # Pass these back to CTest's output for easier diagnosis
     LABELS            "unit;docx;parser"
 )
 
+# Prepend the MinGW compiler bin dir to PATH so CTest finds libgcc_s_seh-1.dll,
+# libstdc++-6.dll, libwinpthread-1.dll even when MSYS2 is not on the system PATH.
+# Must be set AFTER add_test().
+# ENVIRONMENT_MODIFICATION (CMake 3.22+) correctly handles the OS path separator.
+if(WIN32 AND MINGW)
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.22")
+        set_tests_properties(DocxParser.BasicParsing PROPERTIES
+            ENVIRONMENT_MODIFICATION
+                "PATH=path_list_prepend:${_mingw_bin}"
+        )
+    endif()
+    # For CMake < 3.22 the DLL copies above are the fallback: zlib1.dll is
+    # copied next to the exe; libgcc / libstdc++ / libwinpthread are assumed
+    # to be reachable through the existing system PATH (standard MSYS2 setup).
+endif()
+
 # ─── Optional: valgrind memory-check target ───────────────────────────────────
-# Creates a second CTest entry that runs the binary under valgrind when it is
-# available.  Skipped silently on systems without valgrind.
 find_program(VALGRIND_EXECUTABLE valgrind)
 if(VALGRIND_EXECUTABLE)
     add_test(

dist/docx_comment_parser-1.1.1.tar.gz

@@ -18,11 +18,16 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
-// On MSVC the test's in-memory ZIP builder uses crc32(), Bytef, and uInt.
-// The vendored header supplies all three without requiring a system zlib.
-// On Linux/macOS/MinGW the system <zlib.h> is used (no IMPLEMENTATION define,
-// so the function bodies live only in zip_reader.cpp's TU).
+// On MSVC the test's in-memory ZIP builder uses crc32(), Bytef, and uInt from
+// the vendored single-header zlib.  VENDOR_ZLIB_IMPLEMENTATION activates the
+// function bodies in this TU — the same flag zip_reader.cpp uses.  Each TU
+// that defines it gets its own private copy; there is no ODR conflict because
+// the test executable and the shared library are separate binaries.
+// Without this define the bodies live only inside the DLL and are not exported,
+// causing LNK2001 "unresolved external symbol crc32".
+// On Linux/macOS/MinGW the system <zlib.h> is used; crc32 is resolved via -lz.
 #ifdef _MSC_VER
+#  define VENDOR_ZLIB_IMPLEMENTATION
 #  include "../vendor/zlib/zlib.h"
 #else
 #  include <zlib.h>
@@ -185,6 +190,18 @@ static const char* DOCUMENT_XML = R"(<?xml version="1.0" encoding="UTF-8" standa
 
 // ─── Helpers ─────────────────────────────────────────────────────────────────
 
+static std::string temp_docx_path() {
+    // /tmp does not exist on Windows; use %TEMP% / %TMP% instead.
+#ifdef _WIN32
+    const char* dir = std::getenv("TEMP");
+    if (!dir) dir   = std::getenv("TMP");
+    if (!dir) dir   = "C:\\Temp";
+    return std::string(dir) + "\\test_docx_parser_fixture.docx";
+#else
+    return "/tmp/test_docx_parser_fixture.docx";
+#endif
+}
+
 static std::string make_temp_docx() {
     ZipBuilder zb;
     zb.add("[Content_Types].xml",            CONTENT_TYPES);
@@ -196,8 +213,7 @@ static std::string make_temp_docx() {
 
     auto bytes = zb.build();
 
-    // Write to temp file
-    std::string path = "/tmp/test_docx_parser_fixture.docx";
+    std::string path = temp_docx_path();
     std::ofstream f(path, std::ios::binary);
     if (!f) throw std::runtime_error("Cannot create temp file: " + path);
     f.write(reinterpret_cast<const char*>(bytes.data()), bytes.size());