From 9eecf2d05711b8e8677af8ceda17f6b9938b3eb3 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Thu, 19 Mar 2020 03:48:46 +0100 Subject: Revert "lib/modules: Throw better error when definitions assign to an option set" This reverts commit 15c873b486347e7861c64fb0b5a7852be9fc82e4. This was causing infinite recursion when depending on nested options --- lib/tests/modules.sh | 3 --- lib/tests/modules/declare-option-set.nix | 3 --- 2 files changed, 6 deletions(-) delete mode 100644 lib/tests/modules/declare-option-set.nix (limited to 'lib/tests') diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 1b3d01646d84..e80a3eccecd1 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -199,9 +199,6 @@ checkConfigOutput "true" config.conditionalWorks ./declare-attrsOf.nix ./attrsOf checkConfigOutput "false" config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix -# Check error for when an option set is defined to be a non-attribute set value -checkConfigError 'The option path .* is an attribute set of options, but it is defined to not be an attribute set in' \ - config.value ./declare-option-set.nix ./define-value-int-zero.nix # Even with multiple assignments, a type error should be thrown if any of them aren't valid checkConfigError 'The option value .* in .* is not of type .*' \ diff --git a/lib/tests/modules/declare-option-set.nix b/lib/tests/modules/declare-option-set.nix deleted file mode 100644 index fddc650ffa90..000000000000 --- a/lib/tests/modules/declare-option-set.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - options.value = {}; -} -- cgit v1.2.3