diff options
author | Silvan Mosberger <contact@infinisil.com> | 2020-01-09 18:20:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-01-09 18:20:12 +0100 |
commit | e9c16ec186b2fc4be93f9dd2be5afaef76cdc6f8 (patch) | |
tree | 6843c9cf711a97041ba6c964e7a8528e1ae0cae0 /lib/tests | |
parent | 4052aa377e4b1f50ee3f7b147177d1f1d966cf1b (diff) | |
parent | a6462a4a8b9d55586f8706484c155b2de2a34877 (diff) |
Merge pull request #76857 from Infinisil/recursive-disableModules
Apply `disabledModules` recursively
Diffstat (limited to 'lib/tests')
-rwxr-xr-x | lib/tests/modules.sh | 6 | ||||
-rw-r--r-- | lib/tests/modules/disable-recursive/bar.nix | 5 | ||||
-rw-r--r-- | lib/tests/modules/disable-recursive/disable-bar.nix | 7 | ||||
-rw-r--r-- | lib/tests/modules/disable-recursive/disable-foo.nix | 7 | ||||
-rw-r--r-- | lib/tests/modules/disable-recursive/foo.nix | 5 | ||||
-rw-r--r-- | lib/tests/modules/disable-recursive/main.nix | 8 |
6 files changed, 38 insertions, 0 deletions
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index f69befd15c64..2997fb1ada1b 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -177,6 +177,12 @@ checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules. # Temporarily disabled until https://github.com/NixOS/nixpkgs/pull/76861 #checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix +# Check that disabledModules works recursively and correctly +checkConfigOutput "true" config.enable ./disable-recursive/main.nix +checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix} +checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix} +checkConfigError 'The option .* defined in .* does not exist' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix} + cat <<EOF ====== module tests ====== $pass Pass diff --git a/lib/tests/modules/disable-recursive/bar.nix b/lib/tests/modules/disable-recursive/bar.nix new file mode 100644 index 000000000000..4d9240a432df --- /dev/null +++ b/lib/tests/modules/disable-recursive/bar.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../declare-enable.nix + ]; +} diff --git a/lib/tests/modules/disable-recursive/disable-bar.nix b/lib/tests/modules/disable-recursive/disable-bar.nix new file mode 100644 index 000000000000..987b2802ae8c --- /dev/null +++ b/lib/tests/modules/disable-recursive/disable-bar.nix @@ -0,0 +1,7 @@ +{ + + disabledModules = [ + ./bar.nix + ]; + +} diff --git a/lib/tests/modules/disable-recursive/disable-foo.nix b/lib/tests/modules/disable-recursive/disable-foo.nix new file mode 100644 index 000000000000..5b68a3c46105 --- /dev/null +++ b/lib/tests/modules/disable-recursive/disable-foo.nix @@ -0,0 +1,7 @@ +{ + + disabledModules = [ + ./foo.nix + ]; + +} diff --git a/lib/tests/modules/disable-recursive/foo.nix b/lib/tests/modules/disable-recursive/foo.nix new file mode 100644 index 000000000000..4d9240a432df --- /dev/null +++ b/lib/tests/modules/disable-recursive/foo.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ../declare-enable.nix + ]; +} diff --git a/lib/tests/modules/disable-recursive/main.nix b/lib/tests/modules/disable-recursive/main.nix new file mode 100644 index 000000000000..48a3c6218cf3 --- /dev/null +++ b/lib/tests/modules/disable-recursive/main.nix @@ -0,0 +1,8 @@ +{ + imports = [ + ./foo.nix + ./bar.nix + ]; + + enable = true; +} |