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

tests-stdenv-gcc-stageCompare: Fail gracefullyier

Browse Source 
Don't fail with a missing attribute error, so the error can be handled.
This commit is contained in:
Artturin 2024-12-06 18:53:43 +02:00
parent 68ebeaf5fe
commit 653b3558ee
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@
}: }:
assert stdenv.cc.isGNU; assert stdenv.cc.isGNU;
with pkgs; with pkgs;
# rebuild gcc using the "final" stdenv # rebuild gcc using the "final" stdenv
let gcc-stageCompare = (gcc-unwrapped.override { let gcc-stageCompare = (gcc-unwrapped.override {
@ -25,7 +26,9 @@ let gcc-stageCompare = (gcc-unwrapped.override {
}).overrideAttrs(_: { }).overrideAttrs(_: {
NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out; NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out;
}); });
in (runCommand "gcc-stageCompare" {} '' 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" {} ''
diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out diff -sr ${pkgs.gcc-unwrapped.checksum}/checksums ${gcc-stageCompare.checksum}/checksums && touch $out
'').overrideAttrs (a: { '').overrideAttrs (a: {
meta = (a.meta or { }) // { platforms = lib.platforms.linux; }; meta = (a.meta or { }) // { platforms = lib.platforms.linux; };