diff options
author | Victor Engmark <vengmark@linz.govt.nz> | 2021-11-26 10:41:43 +1300 |
---|---|---|
committer | Victor Engmark <vengmark@linz.govt.nz> | 2021-11-26 10:51:56 +1300 |
commit | 04223a0d436f91f3205e901d2d2ffed2f9afbbf6 (patch) | |
tree | be6c779dd64dbf7c47067126e071645cefda2452 /lib/tests | |
parent | 41fd1d8626ff890a28c43062e39c5318e72af35e (diff) | |
download | nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.tar nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.tar.gz nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.tar.bz2 nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.tar.lz nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.tar.xz nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.tar.zst nixpkgs-04223a0d436f91f3205e901d2d2ffed2f9afbbf6.zip |
lib/tests: Remove redundant semicolons
Diffstat (limited to 'lib/tests')
-rwxr-xr-x | lib/tests/modules.sh | 12 |
1 files changed, 6 insertions, 6 deletions
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 "$@" |