gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/tests/modules.sh: Do not redirect diagnostics to stdout

Browse Source 
It still prints its own diagnostics to stdout, but it's always done that.
This commit is contained in:
Robert Hensing
2024-08-12 13:15:50 +02:00
parent 8a6c85d886
commit c516c03bf4
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/tests/modules.sh
View File

@@ -13,7 +13,7 @@ set -o errexit -o noclobber -o nounset -o pipefail
shopt -s failglob inherit_errexit shopt -s failglob inherit_errexit
# https://stackoverflow.com/a/246128/6605742 # https://stackoverflow.com/a/246128/6605742
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
cd "$DIR"/modules cd "$DIR"/modules
@@ -40,7 +40,7 @@ reportFailure() {
local attr=$1 local attr=$1
shift shift
local script="import ./default.nix { modules = [ $* ];}" local script="import ./default.nix { modules = [ $* ];}"
echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only --json" echo "$ nix-instantiate -E '$script' -A '$attr' --eval-only --json"
evalConfig "$attr" "$@" || true evalConfig "$attr" "$@" || true
((++fail)) ((++fail))
} }
@@ -52,7 +52,7 @@ checkConfigOutput() {
((++pass)) ((++pass))
else else
echo "test failure at $(loc):" echo "test failure at $(loc):"
echo 2>&1 "error: Expected result matching '$outputContains', while evaluating" echo "error: Expected result matching '$outputContains', while evaluating"
reportFailure "$@" reportFailure "$@"
fi fi
} }
@@ -63,14 +63,14 @@ checkConfigError() {
shift shift
if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then
echo "test failure at $(loc):" echo "test failure at $(loc):"
echo 2>&1 "error: Expected error code, got exit code 0, while evaluating" echo "error: Expected error code, got exit code 0, while evaluating"
reportFailure "$@" reportFailure "$@"
else else
if echo "$err" | grep -zP --silent "$errorContains" ; then if echo "$err" | grep -zP --silent "$errorContains" ; then
((++pass)) ((++pass))
else else
echo "test failure at $(loc):" echo "test failure at $(loc):"
echo 2>&1 "error: Expected error matching '$errorContains', while evaluating" echo "error: Expected error matching '$errorContains', while evaluating"
reportFailure "$@" reportFailure "$@"
fi fi
fi fi