[acquire/tests/{CMakeLists.txt,config_for_tests.h.in,test_extract.h}] Download greatest archive ; use this archive throughout for testing checksumming, unarchiving, &etc.

Author: SamuelMarks

acquire/tests/CMakeLists.txt

@@ -6,6 +6,7 @@ set(exec_name "test_${PROJECT_NAME}")
 
 set(GREATEST_CRC32C "f83d6ce5")
 set(GREATEST_SHA256 "b3f89ecad2301c64c580f328cc03a74d92f4cd4bf42ab18d3d4bfb7b8be5b948")
+set(GREATEST_ARCHIVE_SHA256 "67bad60cd59fffc6b5bc65934deb338b61e8399703807458539c82afbba87d31")
 
 set(DOWNLOAD_DIR "${PROJECT_BINARY_DIR}/test_downloads")
 
@@ -17,16 +18,19 @@ endif (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT MSYS AND NOT CYGWIN)
 file(MAKE_DIRECTORY "${DOWNLOAD_DIR}")
 
 set(GREATEST_BASEFILENAME "greatest.h")
-set(GREATEST_FILE "${DOWNLOAD_DIR}/${GREATEST_BASEFILENAME}")
-file(TO_NATIVE_PATH "${GREATEST_FILE}" GREATEST_FILE)
-if (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT MSYS AND NOT CYGWIN)
-    string(REPLACE "\\" "\\\\" GREATEST_FILE "${GREATEST_FILE}")
-endif (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT MSYS AND NOT CYGWIN)
 
+set(GREATEST_ARCHIVE "${DOWNLOAD_DIR}/greatest.zip")
+set(GREATEST_ARCHIVE_URL "https://github.com/SamuelMarks/greatest/archive/refs/heads/cmake-and-msvc.zip")
 set(GREATEST_URL "https://raw.githubusercontent.com/SamuelMarks/greatest/cmake-and-msvc/greatest.h")
 
-file(DOWNLOAD "${GREATEST_URL}" "${GREATEST_FILE}"
-        EXPECTED_HASH "SHA256=${GREATEST_SHA256}")
+if (NOT IS_DIRECTORY "${DOWNLOAD_DIR}/greatest")
+    file(DOWNLOAD "${GREATEST_ARCHIVE_URL}" "${GREATEST_ARCHIVE}"
+            EXPECTED_HASH "SHA256=${GREATEST_ARCHIVE_SHA256}")
+
+    file(ARCHIVE_EXTRACT INPUT "${GREATEST_ARCHIVE}" DESTINATION "${DOWNLOAD_DIR}")
+    file(RENAME "${DOWNLOAD_DIR}/greatest-cmake-and-msvc" "${DOWNLOAD_DIR}/greatest")
+endif (NOT IS_DIRECTORY "${DOWNLOAD_DIR}/greatest")
+set(GREATEST_FILE "${DOWNLOAD_DIR}/greatest/greatest.h")
 
 ################################
 # Configure file (interpolate) #
@@ -38,7 +42,6 @@ file(TO_NATIVE_PATH "${GREATEST_FILE}" GREATEST_FILE)
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT MSYS AND NOT CYGWIN)
     string(REPLACE "\\" "\\\\" _CMAKE_CURRENT_SOURCE_DIR "${_CMAKE_CURRENT_SOURCE_DIR}")
     string(REPLACE "\\" "\\\\" _CMAKE_CURRENT_LIST_FILE "${_CMAKE_CURRENT_LIST_FILE}")
-    string(REPLACE "\\" "\\\\" GREATEST_FILE "${GREATEST_FILE}")
 endif (CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT MSYS AND NOT CYGWIN)
 
 ###############################
@@ -93,7 +96,7 @@ macro(test_wrapper)
             "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/src>"
             "$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/acquire>"
             "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/acquire>"
-            "$<BUILD_INTERFACE:${DOWNLOAD_DIR}>"
+            "$<BUILD_INTERFACE:${DOWNLOAD_DIR}/greatest>"
     )
 
     add_test(NAME "${EXEC_NAME}" COMMAND "${EXEC_NAME}")

acquire/tests/config_for_tests.h.in

@@ -19,7 +19,9 @@
 
 #define GREATEST_FILE "@GREATEST_FILE@"
 
-#define MINIZ_ZIP_FILE "@MINIZ_ZIP_FILE@"
+#define GREATEST_ARCHIVE_SHA256 "@GREATEST_ARCHIVE_SHA256@"
+
+#define GREATEST_ARCHIVE "@GREATEST_ARCHIVE@"
 
 #define MINIZ_BASENAME_NO_EXT "@MINIZ_BASENAME_NO_EXT@"
 

acquire/tests/test_extract.h

@@ -43,12 +43,13 @@ TEST x_test_extract_archive(void) {
   puts("\"test_extract.h\" for ARCHIVE_LIB: \"" STR(
       ARCHIVE_LIB) "\" into EXTRACT_DIR: \"" EXTRACT_DIR "\"");
 
-  ASSERT_FALSE(extract_archive(LIBACQUIRE_ZIP, MINIZ_ZIP_FILE, EXTRACT_DIR) !=
+  ASSERT_FALSE(extract_archive(LIBACQUIRE_ZIP, GREATEST_ARCHIVE, EXTRACT_DIR) !=
                EXIT_SUCCESS);
 
   /* Could add a comprehensive file check here */
-  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "greatest.h"));
-  ASSERT_FALSE(!is_directory(EXTRACT_DIR));
+  ASSERT_FALSE(!is_directory(EXTRACT_DIR PATH_SEP "greatest-cmake-and-msvc"));
+  ASSERT_FALSE(!is_file(EXTRACT_DIR PATH_SEP "greatest-cmake-and-msvc" PATH_SEP
+                                             "greatest.h"));
 
 #undef EXTRACT_DIR
   PASS();