mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 06:53:01 +00:00
tests.buildRustCrate: Fix after hashing method change
As @lopsided98 points out in #105305, since the hashes are now target sensative, and until we find reason to actually care to test what they are exactly, we are best just normalizing them away in the tests.
This commit is contained in:
parent
5d2a20c93a
commit
ddeef0d322
@ -146,12 +146,18 @@ let
|
||||
};
|
||||
in
|
||||
runCommand "assert-outputs-${name}" {
|
||||
} ''
|
||||
} (''
|
||||
local actualFiles=$(mktemp)
|
||||
|
||||
cd "${crateOutput}"
|
||||
find . -type f | sort >$actualFiles
|
||||
diff -q ${expectedFilesFile} $actualFiles >/dev/null || {
|
||||
find . -type f \
|
||||
| sort \
|
||||
''
|
||||
# sed out the hash because it differs per platform
|
||||
+ ''
|
||||
| sed -E -e 's/-[0-9a-fA-F]{10}\.rlib/-HASH.rlib/g' \
|
||||
> "$actualFiles"
|
||||
diff -q ${expectedFilesFile} "$actualFiles" > /dev/null || {
|
||||
echo -e "\033[0;1;31mERROR: Difference in expected output files in ${crateOutput} \033[0m" >&2
|
||||
echo === Got:
|
||||
sed -e 's/^/ /' $actualFiles
|
||||
@ -164,7 +170,7 @@ let
|
||||
exit 1
|
||||
}
|
||||
touch $out
|
||||
''
|
||||
'')
|
||||
;
|
||||
|
||||
in rec {
|
||||
@ -594,7 +600,7 @@ let
|
||||
};
|
||||
expectedFiles = [
|
||||
"./nix-support/propagated-build-inputs"
|
||||
"./lib/libtest_lib-042a1fdbef.rlib"
|
||||
"./lib/libtest_lib-HASH.rlib"
|
||||
"./lib/link"
|
||||
];
|
||||
};
|
||||
@ -611,7 +617,7 @@ let
|
||||
};
|
||||
expectedFiles = [
|
||||
"./nix-support/propagated-build-inputs"
|
||||
"./lib/libtest_lib-042a1fdbef.rlib"
|
||||
"./lib/libtest_lib-HASH.rlib"
|
||||
"./lib/link"
|
||||
];
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user