Remaining functional/ca tests for shellcheck

Author: fzakaria

maintainers/flake-module.nix

@@ -168,21 +168,6 @@
               ''^tests/functional/user-envs\.builder\.sh$''
               ''^tests/functional/user-envs\.sh$''
               ''^tests/functional/why-depends\.sh$''
-
-              # Content-addressed test files that use recursive-*looking* sourcing
-              # (cd .. && source <self>), causing shellcheck to loop
-              # They're small wrapper scripts with not a lot going on
-              ''^tests/functional/ca/eval-store\.sh$''
-              ''^tests/functional/ca/gc\.sh$''
-              ''^tests/functional/ca/import-from-derivation\.sh$''
-              ''^tests/functional/ca/multiple-outputs\.sh$''
-              ''^tests/functional/ca/new-build-cmd\.sh$''
-              ''^tests/functional/ca/nix-shell\.sh$''
-              ''^tests/functional/ca/post-hook\.sh$''
-              ''^tests/functional/ca/recursive\.sh$''
-              ''^tests/functional/ca/repl\.sh$''
-              ''^tests/functional/ca/selfref-gc\.sh$''
-              ''^tests/functional/ca/why-depends\.sh$''
             ];
           };
         };

tests/functional/ca/build-dry.sh

@@ -1,3 +1,4 @@
+# shellcheck shell=bash
 source common.sh
 
 export NIX_TESTS_CA_BY_DEFAULT=1

tests/functional/ca/eval-store.sh

@@ -7,4 +7,5 @@ source common.sh
 export NIX_TESTS_CA_BY_DEFAULT=1
 
 cd ..
+# shellcheck source=/dev/null
 source eval-store.sh

tests/functional/ca/gc.sh

@@ -7,4 +7,5 @@ source common.sh
 export NIX_TESTS_CA_BY_DEFAULT=1
 
 cd ..
+# shellcheck source=/dev/null
 source gc.sh

tests/functional/ca/import-from-derivation.sh

@@ -3,6 +3,6 @@
 source common.sh
 
 export NIX_TESTS_CA_BY_DEFAULT=1
-
+# shellcheck source=/dev/null
 cd .. && source import-from-derivation.sh
 

tests/functional/ca/multiple-outputs.sh

@@ -4,4 +4,5 @@ source common.sh
 
 export NIX_TESTS_CA_BY_DEFAULT=1
 cd ..
+# shellcheck source=/dev/null
 source ./multiple-outputs.sh

tests/functional/ca/new-build-cmd.sh

@@ -4,4 +4,5 @@ source common.sh
 
 export NIX_TESTS_CA_BY_DEFAULT=1
 cd ..
+# shellcheck source=/dev/null
 source ./build.sh

tests/functional/ca/nix-shell.sh

@@ -2,6 +2,8 @@
 
 source common.sh
 
+# shellcheck disable=SC2034
 NIX_TESTS_CA_BY_DEFAULT=true
 cd ..
+# shellcheck source=/dev/null
 source ./nix-shell.sh

tests/functional/ca/post-hook.sh

@@ -6,6 +6,7 @@ requireDaemonNewerThan "2.4pre20210626"
 
 export NIX_TESTS_CA_BY_DEFAULT=1
 cd ..
+# shellcheck source=/dev/null
 source ./post-hook.sh
 
 

tests/functional/ca/recursive.sh

@@ -6,4 +6,5 @@ requireDaemonNewerThan "2.4pre20210623"
 
 export NIX_TESTS_CA_BY_DEFAULT=1
 cd ..
+# shellcheck source=/dev/null
 source ./recursive.sh