From d16e068b146a8849c0aa42cc88cb8960b8047dca Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Mon, 16 Jan 2023 12:49:09 +0100 Subject: [PATCH] testers.testBuildFailure: Fix A call to getAllOutputNames was added as part of the structuredAttrs effort, but this script does not source `setup.sh`, so I repeat the definition here. Should be a bit quicker than `source setup.sh`. --- pkgs/build-support/testers/expect-failure.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/build-support/testers/expect-failure.sh b/pkgs/build-support/testers/expect-failure.sh index 052ee8527176..60354cf3541b 100644 --- a/pkgs/build-support/testers/expect-failure.sh +++ b/pkgs/build-support/testers/expect-failure.sh @@ -35,6 +35,14 @@ echo "testBuildFailure: Original builder produced exit code: $r" # ----------------------------------------- # Write the build log to the default output +getAllOutputNames() { + if [ -n "$__structuredAttrs" ]; then + echo "${!outputs[*]}" + else + echo "$outputs" + fi +} + outs=( $(getAllOutputNames) ) defOut=${outs[0]} defOutPath=${!defOut}