Simplify cleaning up files in test-compress cmake script and always clean up files...

diff --git a/cmake/test-compress.cmake b/cmake/test-compress.cmake
index 1ec1b27ed3e7c2c8cb6f743c6b42bc17085f41b4..89f0a7b256c4ea4146dfd2087795b78a2e9f1b71 100644 (file)
--- a/cmake/test-compress.cmake
+++ b/cmake/test-compress.cmake
@@ -65,14 +65,14 @@ get_filename_component(OUTPUT_DIR "${OUTPUT_BASE}" DIRECTORY)
 file(MAKE_DIRECTORY "${OUTPUT_DIR}")
 
 # Cleanup temporary files
+macro(cleanup_always)
+    file(GLOB TEMP_FILES ${OUTPUT_BASE}*)
+    file(REMOVE ${TEMP_FILES})
+endmacro()
+# Clean up temporary files if not on CI
 macro(cleanup)
     if(NOT DEFINED ENV{CI})
-        file(REMOVE
-            ${OUTPUT_BASE}.gz
-            ${OUTPUT_BASE}.out
-            ${OUTPUT_BASE}.gzip
-            ${OUTPUT_BASE}.gzip.gz
-            ${OUTPUT_BASE}.gzip.out)
+        cleanup_always()
     endif()
 endmacro()
 
@@ -246,4 +246,5 @@ if(GZIP_VERIFY AND NOT "${COMPRESS_ARGS}" MATCHES "-T")
     endif()
 endif()
 
-cleanup()
\ No newline at end of file
+
+cleanup_always()
\ No newline at end of file