Unverified Commit 4c5458df authored by Wolfgang Walther's avatar Wolfgang Walther
Browse files

testers.testBuildFailure: fix 

Introduced by cf127c9d, which changed
default-builder.sh, but forgot to tell testBuildFailure about it.
parent 1cd1cb9d

pkgs/build-support/testers/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
        };

      })

      orig.realBuilder or stdenv.shell

    ] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];

    ] ++ orig.args or ["-e" ../../stdenv/generic/source-stdenv.sh (orig.builder or ../../stdenv/generic/default-builder.sh)];

  });



  # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation

pkgs/build-support/testers/expect-failure.sh

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ echo "testBuildFailure: Original builder produced exit code: $r" 
# -----------------------------------------

# Write the build log to the default output



# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/default-builder.sh

# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/source-stdenv.sh

#

# We need this so that we can read $outputs when `__structuredAttrs` is enabled

#