Unverified Commit 00084dc3 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

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

parents f3e80f8e 3ea96163

pkgs/test/stdenv/gcc-stageCompare.nix

+17 −7
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
  lib,

}:



assert stdenv.cc.isGNU;



with pkgs;

# rebuild gcc using the "final" stdenv

let
@@ -31,11 +29,23 @@ let 
        NIX_OUTPATH_USED_AS_RANDOM_SEED = stdenv.cc.cc.out;

      });

in



(runCommand "gcc-stageCompare"

  {

    checksumCompare =

      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

'').overrideAttrs

      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: {

    meta = (a.meta or { }) // {

      platforms = lib.platforms.linux;

pkgs/top-level/release-small.nix

+1 −1
Original line number Diff line number Diff line
@@ -176,5 +176,5 @@ in 
  xfsprogs = linux;

  xkeyboard_config = linux;

  zip = all;

  tests-stdenv-gcc-stageCompare = all;

  tests-stdenv-gcc-stageCompare = linux;

}))