diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-11-29 16:28:12 +0000 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-12-19 19:05:07 +0000 |
commit | ddeef0d3221ea182b5411c9084b59373883d0edb (patch) | |
tree | ef86c4bebf977de11771c1888dbfcf395ef5d0dd /pkgs/build-support/rust | |
parent | 5d2a20c93aeb45dd6de3cbc522692499ff161c34 (diff) | |
download | nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.tar nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.tar.gz nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.tar.bz2 nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.tar.lz nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.tar.xz nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.tar.zst nixpkgs-ddeef0d3221ea182b5411c9084b59373883d0edb.zip |
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.
Diffstat (limited to 'pkgs/build-support/rust')
-rw-r--r-- | pkgs/build-support/rust/build-rust-crate/test/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index f6cd54c4ee3..65c8880b134 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -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" ]; }; |