From 0c50d5b25ab90e50c88065f574a03fc8bbd4be0e Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Sun, 28 Sep 2025 20:27:21 -0700 Subject: [PATCH] shellcheck fix: tests/functional/local-overlay-store/redundant-add-inner.sh --- maintainers/flake-module.nix | 1 - .../functional/local-overlay-store/redundant-add-inner.sh | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix index a48f55322..c509eb85b 100644 --- a/maintainers/flake-module.nix +++ b/maintainers/flake-module.nix @@ -138,7 +138,6 @@ ''^tests/functional/local-overlay-store/gc\.sh$'' ''^tests/functional/local-overlay-store/optimise-inner\.sh$'' ''^tests/functional/local-overlay-store/optimise\.sh$'' - ''^tests/functional/local-overlay-store/redundant-add-inner\.sh$'' ''^tests/functional/logging\.sh$'' ''^tests/functional/misc\.sh$'' ''^tests/functional/multiple-outputs\.sh$'' diff --git a/tests/functional/local-overlay-store/redundant-add-inner.sh b/tests/functional/local-overlay-store/redundant-add-inner.sh index e37ef90e5..2be122fc6 100755 --- a/tests/functional/local-overlay-store/redundant-add-inner.sh +++ b/tests/functional/local-overlay-store/redundant-add-inner.sh @@ -22,14 +22,14 @@ mountOverlayfs pathInLowerStore=$(nix-store --store "$storeA" --add ../dummy) # upper layer should not have it -expect 1 stat $(toRealPath "$storeBTop/nix/store" "$pathInLowerStore") +expect 1 stat "$(toRealPath "$storeBTop/nix/store" "$pathInLowerStore")" pathFromB=$(nix-store --store "$storeB" --add ../dummy) -[[ $pathInLowerStore == $pathFromB ]] +[[ $pathInLowerStore == "$pathFromB" ]] # lower store should have it from before -stat $(toRealPath "$storeA/nix/store" "$pathInLowerStore") +stat "$(toRealPath "$storeA/nix/store" "$pathInLowerStore")" # upper layer should still not have it (no redundant copy) -expect 1 stat $(toRealPath "$storeBTop" "$pathInLowerStore") +expect 1 stat "$(toRealPath "$storeBTop" "$pathInLowerStore")"