Merge topic 'test-libarchive-3.8.2' into release-3.31

576117b7eb Tests: Update expected Zstandard magic number for libarchive 3.8.2

Acked-by: Kitware Robot <[email protected]>
Merge-request: !11402

Tests/RunCMake/CommandLineTar/pax-zstd.cmake

@@ -7,4 +7,5 @@ set(DECOMPRESSION_FLAGS xvf)
 
 include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake)
 
-check_magic("28b52ffd0058" LIMIT 6 HEX)
+# libarchive 3.8.2 enables a checksum feature; older versions do not.
+check_magic("^28b52ffd0[04]58$" LIMIT 6 HEX)

Tests/RunCMake/CommandLineTar/roundtrip.cmake

@@ -86,6 +86,10 @@ function(check_magic EXPECTED)
     ${ARGN}
   )
 
+  if(EXPECTED MATCHES "[^0-9a-f]" AND ACTUAL MATCHES "${EXPECTED}")
+    return()
+  endif()
+
   if(NOT ACTUAL STREQUAL EXPECTED)
     message(FATAL_ERROR
       "Actual [${ACTUAL}] does not match expected [${EXPECTED}]")

Tests/RunCMake/File_Archive/pax-zstd.cmake

@@ -5,4 +5,5 @@ set(COMPRESSION_TYPE Zstd)
 
 include(${CMAKE_CURRENT_LIST_DIR}/roundtrip.cmake)
 
-check_magic("28b52ffd0058" LIMIT 6 HEX)
+# libarchive 3.8.2 enables a checksum feature; older versions do not.
+check_magic("^28b52ffd0[04]58$" LIMIT 6 HEX)

Tests/RunCMake/File_Archive/roundtrip.cmake

@@ -86,6 +86,10 @@ function(check_magic EXPECTED)
     ${ARGN}
   )
 
+  if(EXPECTED MATCHES "[^0-9a-f]" AND ACTUAL MATCHES "${EXPECTED}")
+    return()
+  endif()
+
   if(NOT ACTUAL STREQUAL EXPECTED)
     message(FATAL_ERROR
       "Actual [${ACTUAL}] does not match expected [${EXPECTED}]")