tests: Improve COFF object file comparison (#789)

Make `is_equal_object_files` more lenient when comparing COFF object
files.

COFF object files contain the original source file name, which was
breaking the cpp1 test. They often contain a timestamp used by the
incremental linker, unless this is explicitly disabled via `/Brepro`
(MSVC) or `-mno-incremental-linker-compatible` (clang).

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index fcf15e20c8f3790cce59b1bd6c8cdab705f1a0f2..1469033bb79e7107986cd30df064213f891fd0b1 100644 (file)
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -206,8 +206,7 @@ jobs:
             ENABLE_CACHE_CLEANUP_TESTS: 1
             CMAKE_GENERATOR: Ninja
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON
-            # -mno-incremental-linker-compatible: reproducible object files
-            TEST_CC: clang -target i686-pc-windows-msvc -mno-incremental-linker-compatible
+            TEST_CC: clang -target i686-pc-windows-msvc
 
           - name: Windows VS2019 64-bit
             os: windows-2019
@@ -218,8 +217,7 @@ jobs:
             ENABLE_CACHE_CLEANUP_TESTS: 1
             CMAKE_GENERATOR: Ninja
             CMAKE_PARAMS: -DCMAKE_BUILD_TYPE=CI -DZSTD_FROM_INTERNET=ON
-            # -mno-incremental-linker-compatible: reproducible object files
-            TEST_CC: clang -target x86_64-pc-windows-msvc -mno-incremental-linker-compatible
+            TEST_CC: clang -target x86_64-pc-windows-msvc
 
           - name: Clang address & UB sanitizer
             os: ubuntu-20.04

diff --git a/test/run b/test/run
index e51dac5545f5373909e985df7d4d6226df606db6..224494390a9b4dcd04b7f1a636200ff10052f433 100755 (executable)
--- a/test/run
+++ b/test/run
@@ -226,6 +226,22 @@ is_equal_object_files() {
         elfdump -a -w "$2".dump "$2"
         # these were the elfdump fields that seemed to differ (empirically)
         diff -I e_shoff -I sh_size -I st_name "$1".dump "$2".dump > /dev/null
+    elif $HOST_OS_WINDOWS && command -v dumpbin.exe >/dev/null; then
+        # Filter out fields that are affected by compilation time or source
+        # filename.
+        local awk_filter='
+            skip {--skip; next}
+
+            /Dump of file/ {next}                 # dumbin header
+            /time date stamp/ {next}              # incremental linker timestamp
+            /number of symbols/ {next}            # symbol count
+            /Filename *\| \.file$/ {skip=1; next} # .file symbol
+
+            {print}
+        '
+        dumpbin.exe -all -nologo "$1" | awk "$awk_filter" > "$1".dump
+        dumpbin.exe -all -nologo "$2" | awk "$awk_filter" > "$2".dump
+        cmp -s "$1".dump "$2".dump
     else
         cmp -s "$1" "$2"
     fi