Added cmake tests to verify output of makefixed (#398)

* Add auto-generated header files to .gitignore
* Remove auto-generated header files in make clean

diff --git a/.gitignore b/.gitignore
index da5bec5bd60a460fc2ce142d18e80d9d2ed3bdad..1687788c37aba8814fc141d1316136e748a9312a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ CMakeFiles
 Testing
 *.cmake
 *.stackdump
+*._h
 zconf.h
 zconf.h.cmakein
 zconf.h.included

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7f709f92ceb6eacc66473c7f5dba2bf8e444c010..2904121cb3720e3966aff29f4a6f59a7317f005c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -890,6 +890,18 @@ if (ZLIB_ENABLE_TESTS)
         add_test(NAME CVE-2003-0107 COMMAND CVE-2003-0107)
     endif()
 
+    set(MAKEFIXED_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makefixed>)
+    add_test(NAME makefixed
+        COMMAND ${CMAKE_COMMAND}
+        "-DCOMMAND=${MAKEFIXED_COMMAND}"
+        -DOUTPUT=${CMAKE_CURRENT_SOURCE_DIR}/inffixed._h
+        -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/run-and-redirect.cmake)
+
+    add_test(NAME makefixed-cmp
+        COMMAND ${CMAKE_COMMAND} -E compare_files
+            ${CMAKE_CURRENT_SOURCE_DIR}/inffixed.h
+            ${CMAKE_CURRENT_SOURCE_DIR}/inffixed._h)
+
     set(GH_361_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:minigzip> -4)
     add_test(NAME GH-361
         COMMAND ${CMAKE_COMMAND}

diff --git a/Makefile.in b/Makefile.in
index cf107b97ee53d175d43072aed728c48f01818061..9b5352a03a7a1cef8374d2b164bbc0251321b90b 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -347,6 +347,7 @@ clean:
        rm -f *.gcda *.gcno *.gcov
        rm -f a.out a.exe
        rm -f *.pc
+       rm -f *._h
 
 maintainer-clean: distclean
 distclean: clean

diff --git a/cmake/run-and-redirect.cmake b/cmake/run-and-redirect.cmake
index a18fa5e74e5706d3856cdad5690361eb4d9bc0a2..e557e0804d117d96894773b28fc1d445f3224e3b 100644 (file)
--- a/cmake/run-and-redirect.cmake
+++ b/cmake/run-and-redirect.cmake
@@ -1,12 +1,20 @@
-if(WIN32)
-    set(DEVNULL NUL)
+if(NOT OUTPUT)
+    if(WIN32)
+        set(OUTPUT NUL)
+    else()
+        set(OUTPUT /dev/null)
+    endif()
+endif()
+if(INPUT)
+    execute_process(COMMAND ${COMMAND}
+        RESULT_VARIABLE CMD_RESULT
+        INPUT_FILE ${INPUT}
+        OUTPUT_FILE ${OUTPUT})
 else()
-    set(DEVNULL /dev/null)
+    execute_process(COMMAND ${COMMAND}
+        RESULT_VARIABLE CMD_RESULT
+        OUTPUT_FILE ${OUTPUT})
 endif()
-execute_process(COMMAND ${COMMAND}
-    RESULT_VARIABLE CMD_RESULT
-    INPUT_FILE ${INPUT}
-    OUTPUT_FILE ${DEVNULL})
 if(SUCCESS_EXIT)
     list(FIND SUCCESS_EXIT ${CMD_RESULT} _INDEX)
     if (${_INDEX} GREATER -1)