From 1579a55978c9c59e1ee981ea8fdbdddb70e5389d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mos=C3=A8=20Giordano?= <mose@gnu.org>
Date: Fri, 29 Dec 2023 22:14:31 +0100
Subject: [PATCH] Update expected hashes in reproducibility tests

---
 test/auditing.jl | 6 +++---
 test/building.jl | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/auditing.jl b/test/auditing.jl
index 3f2361625..025bb1b95 100644
--- a/test/auditing.jl
+++ b/test/auditing.jl
@@ -667,7 +667,7 @@ end
             # Ensure the build products were created
             @test isfile(tarball_path)
             # Ensure reproducibility of build
-            @test build_output_meta[platform][3] == Base.SHA1("06ddfbeb9914a534ed3f21795b5da5b536d33c16")
+            @test build_output_meta[platform][3] == Base.SHA1("0165cfbbbb8e521707299d649359f2bfdc28f204")
 
             # Unpack it somewhere else
             @test verify(tarball_path, tarball_hash)
@@ -733,8 +733,8 @@ end
 @testset "Auditor - Reproducible libraries on Windows" begin
     platform = Platform("i686", "windows")
     expected_git_shas = Dict(
-        v"4" => Base.SHA1("64017544630a472081ba10879e58901d5e3b53a0"),
-        v"6" => Base.SHA1("31afae67c528151860c18128696b19c85309b556"),
+        v"4" => Base.SHA1("1b625af3aa29c4b4b398f1eeaccc83d781bca1a5"),
+        v"6" => Base.SHA1("61767c3a66a66caeed84ee747a95021a94e77e3d"),
     )
     @testset "gcc version $(gcc_version)" for gcc_version in (v"4", v"6")
         mktempdir() do build_path
diff --git a/test/building.jl b/test/building.jl
index 435c2f0dc..90599a514 100644
--- a/test/building.jl
+++ b/test/building.jl
@@ -204,7 +204,7 @@ end
             i686_windows  => Base.SHA1("f39858ccc34a63a648cf21d33ae236bfdd706d09"),
         ),
         v"5" => Dict(
-            x86_64_linux  => Base.SHA1("b202768af2c23d5ffa76df338eedeba10044c7f9"),
+            x86_64_linux  => Base.SHA1("743b2eac2e096281a2c69f95a2f58a4583824a84"),
             ppc64le_linux => Base.SHA1("b663282a6101647c0aa87043a632b6cdc08f761f"),
             armv7l_linux  => Base.SHA1("9a3273d5c7a41e7c2a5ab58b6b69db49a8533bc1"),
             aarch64_linux => Base.SHA1("4bab3a85aceb3e589989f1a11a2f092c5038a6e0"),
@@ -212,7 +212,7 @@ end
             i686_windows  => Base.SHA1("9390a3c24a8e274e6d7245c6c977f97b406bc3f5"),
         ),
         v"6" => Dict(
-            x86_64_linux  => Base.SHA1("8917015bdd43c961da93b003d67ccd9dd5debd54"),
+            x86_64_linux  => Base.SHA1("0b152c2cc8ff2af82f8d2d0adbbe26e0961131ed"),
             ppc64le_linux => Base.SHA1("97b7e5682b3cadc873644931b17894fa2ff05335"),
             armv7l_linux  => Base.SHA1("267b443b17b99ca2a14ea93d2afc2cce51cad05e"),
             aarch64_linux => Base.SHA1("b396b1d94aba8642a68122a3515b26e4397217a0"),
@@ -246,10 +246,10 @@ end
 
             for p in troublesome_platforms
                 # Test build reproducibility
-                # Note: for some reasons, GCC 5 for i686 windows gives different results on
+                # Note: for some reasons, GCC for i686 windows gives different results on
                 # different systems, while still always reproducible on each of them:
                 # https://github.com/JuliaPackaging/BinaryBuilder.jl/pull/1234#issuecomment-1264192726
-                @test build_output_meta[p][3] == expected_git_shas[gcc_version][p] skip=(Sys.iswindows(p) && gcc_version==v"5")
+                @test build_output_meta[p][3] == expected_git_shas[gcc_version][p] skip=(Sys.iswindows(p))
             end
 
             # Just a simple test to ensure that it worked.