talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

tests-stdenv-gcc-stageCompare: delay asserts (#427205)

Browse Source
This commit is contained in:
Philip Taron 2025-07-21 16:03:04 -07:00 committed by GitHub
commit 00084dc3fb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/test/stdenv/gcc-stageCompare.nix
View File

@ -14,8 +14,6 @@
lib, lib,
}: }:
assert stdenv.cc.isGNU;
with pkgs; with pkgs;
# rebuild gcc using the "final" stdenv # rebuild gcc using the "final" stdenv
let let
@ -31,11 +29,23 @@ let
NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out; NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out;
}); });
in in
assert lib.assertMsg (gcc-stageCompare ? checksum)
"tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`"; (runCommand "gcc-stageCompare"
(runCommand "gcc-stageCompare" { } '' {
diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out checksumCompare =
'').overrideAttrs assert lib.assertMsg (gcc-stageCompare ? checksum)
"tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`";
gcc-stageCompare.checksum;
checksumUnwrapped =
assert lib.assertMsg (pkgs.gcc-unwrapped ? checksum)
"tests-stdenv-gcc-stageCompare: No `checksum` output in `gcc-stageCompare` see conditional in `gcc/common/checksum.nix`";
pkgs.gcc-unwrapped.checksum;
}
''
diff -sr "$checksumUnwrapped"/checksums "$checksumCompare"/checksums && touch $out
''
).overrideAttrs
(a: { (a: {
meta = (a.meta or { }) // { meta = (a.meta or { }) // {
platforms = lib.platforms.linux; platforms = lib.platforms.linux;

2
pkgs/top-level/release-small.nix
View File

@ -176,5 +176,5 @@ in
xfsprogs = linux; xfsprogs = linux;
xkeyboard_config = linux; xkeyboard_config = linux;
zip = all; zip = all;
tests-stdenv-gcc-stageCompare = all; tests-stdenv-gcc-stageCompare = linux;
})) }))