From 04223a0d436f91f3205e901d2d2ffed2f9afbbf6 Mon Sep 17 00:00:00 2001 From: Victor Engmark Date: Fri, 26 Nov 2021 10:41:43 +1300 Subject: lib/tests: Remove redundant semicolons --- lib/tests/modules.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'lib/tests') diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 92740f92a16..bcaa0d3ae18 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -13,14 +13,14 @@ fail=0 evalConfig() { local attr=$1 - shift; + shift local script="import ./default.nix { modules = [ $@ ];}" nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode } reportFailure() { local attr=$1 - shift; + shift local script="import ./default.nix { modules = [ $@ ];}" echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only" evalConfig "$attr" "$@" @@ -29,10 +29,10 @@ reportFailure() { checkConfigOutput() { local outputContains=$1 - shift; + shift if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then pass=$((pass + 1)) - return 0; + return 0 else echo 2>&1 "error: Expected result matching '$outputContains', while evaluating" reportFailure "$@" @@ -43,7 +43,7 @@ checkConfigOutput() { checkConfigError() { local errorContains=$1 local err="" - shift; + shift if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then echo 2>&1 "error: Expected error code, got exit code 0, while evaluating" reportFailure "$@" @@ -51,7 +51,7 @@ checkConfigError() { else if echo "$err" | grep -zP --silent "$errorContains" ; then pass=$((pass + 1)) - return 0; + return 0 else echo 2>&1 "error: Expected error matching '$errorContains', while evaluating" reportFailure "$@" -- cgit 1.4.1