From 8f1430153360dee20c62ce2a2d01f3be467b5450 Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Sun, 28 Sep 2025 20:38:46 -0700 Subject: [PATCH] shellcheck fix: tests/functional/local-overlay-store/build-inner.sh --- maintainers/flake-module.nix | 2 -- tests/functional/local-overlay-store/build-inner.sh | 6 +++--- tests/functional/local-overlay-store/build.sh | 1 + 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix index e78766669..feb69ada0 100644 --- a/maintainers/flake-module.nix +++ b/maintainers/flake-module.nix @@ -125,8 +125,6 @@ ''^tests/functional/local-overlay-store/add-lower-inner\.sh$'' ''^tests/functional/local-overlay-store/add-lower\.sh$'' ''^tests/functional/local-overlay-store/bad-uris\.sh$'' - ''^tests/functional/local-overlay-store/build-inner\.sh$'' - ''^tests/functional/local-overlay-store/build\.sh$'' ''^tests/functional/logging\.sh$'' ''^tests/functional/misc\.sh$'' ''^tests/functional/multiple-outputs\.sh$'' diff --git a/tests/functional/local-overlay-store/build-inner.sh b/tests/functional/local-overlay-store/build-inner.sh index 1f3ddded7..2463e4467 100755 --- a/tests/functional/local-overlay-store/build-inner.sh +++ b/tests/functional/local-overlay-store/build-inner.sh @@ -18,13 +18,13 @@ mountOverlayfs ### Do a build in overlay store -path=$(nix-build ../hermetic.nix --arg busybox $busybox --arg seed 2 --store "$storeB" --no-out-link) +path=$(nix-build ../hermetic.nix --arg busybox "$busybox" --arg seed 2 --store "$storeB" --no-out-link) # Checking for path in lower layer (should fail) -expect 1 stat $(toRealPath "$storeA/nix/store" "$path") +expect 1 stat "$(toRealPath "$storeA/nix/store" "$path")" # Checking for path in upper layer -stat $(toRealPath "$storeBTop" "$path") +stat "$(toRealPath "$storeBTop" "$path")" # Verifying path in overlay store nix-store --verify-path --store "$storeB" "$path" diff --git a/tests/functional/local-overlay-store/build.sh b/tests/functional/local-overlay-store/build.sh index 2251be7e7..d4a29d6c2 100755 --- a/tests/functional/local-overlay-store/build.sh +++ b/tests/functional/local-overlay-store/build.sh @@ -1,3 +1,4 @@ +# shellcheck shell=bash source common.sh source ../common/init.sh