@@ -1,8 +1,11 @@
1−#!/bin/sh
1+#!/usr/bin/env bash
22#
33# This script is used to test that the module system is working as expected.
44# By default it test the version of nixpkgs which is defined in the NIX_PATH.
55
6+set -o errexit -o noclobber -o nounset -o pipefail
7+shopt -s failglob inherit_errexit
8+
69# https://stackoverflow.com/a/246128/6605742
710DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
811
@@ -13,101 +16,96 @@ fail=0
1316
1417evalConfig() {
1518 local attr=$1
16− shift;
17− local script="import ./default.nix { modules = [ $@ ];}"
19+ shift
20+ local script="import ./default.nix { modules = [ $* ];}"
1821 nix-instantiate --timeout 1 -E "$script" -A "$attr" --eval-only --show-trace --read-write-mode
1922}
2023
2124reportFailure() {
2225 local attr=$1
23− shift;
24− local script="import ./default.nix { modules = [ $@ ];}"
26+ shift
27+ local script="import ./default.nix { modules = [ $* ];}"
2528 echo 2>&1 "$ nix-instantiate -E '$script' -A '$attr' --eval-only"
26− evalConfig "$attr" "$@"
27− fail=$((fail + 1))
29+ evalConfig "$attr" "$@" || true
30+ ((++fail))
2831}
2932
3033checkConfigOutput() {
3134 local outputContains=$1
32− shift;
35+ shift
3336 if evalConfig "$@" 2>/dev/null | grep --silent "$outputContains" ; then
34− pass=$((pass + 1))
35− return 0;
37+ ((++pass))
3638 else
3739 echo 2>&1 "error: Expected result matching '$outputContains', while evaluating"
3840 reportFailure "$@"
39− return 1
4041 fi
4142}
4243
4344checkConfigError() {
4445 local errorContains=$1
4546 local err=""
46− shift;
47− if err==$(evalConfig "$@" 2>&1 >/dev/null); then
47+ shift
48+ if err="$(evalConfig "$@" 2>&1 >/dev/null)"; then
4849 echo 2>&1 "error: Expected error code, got exit code 0, while evaluating"
4950 reportFailure "$@"
50− return 1
5151 else
5252 if echo "$err" | grep -zP --silent "$errorContains" ; then
53− pass=$((pass + 1))
54− return 0;
53+ ((++pass))
5554 else
5655 echo 2>&1 "error: Expected error matching '$errorContains', while evaluating"
5756 reportFailure "$@"
58− return 1
5957 fi
6058 fi
6159}
6260
6361# Check boolean option.
64−checkConfigOutput "false" config.enable ./declare-enable.nix
62+checkConfigOutput '^false$' config.enable ./declare-enable.nix
6563checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./define-enable.nix
6664
6765# Check integer types.
6866# unsigned
69−checkConfigOutput "42" config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
67+checkConfigOutput '^42$' config.value ./declare-int-unsigned-value.nix ./define-value-int-positive.nix
7068checkConfigError 'A definition for option .* is not of type.*unsigned integer.*. Definition values:\n\s*- In .*: -23' config.value ./declare-int-unsigned-value.nix ./define-value-int-negative.nix
7169# positive
7270checkConfigError 'A definition for option .* is not of type.*positive integer.*. Definition values:\n\s*- In .*: 0' config.value ./declare-int-positive-value.nix ./define-value-int-zero.nix
7371# between
74−checkConfigOutput "42" config.value ./declare-int-between-value.nix ./define-value-int-positive.nix
72+checkConfigOutput '^42$' config.value ./declare-int-between-value.nix ./define-value-int-positive.nix
7573checkConfigError 'A definition for option .* is not of type.*between.*-21 and 43.*inclusive.*. Definition values:\n\s*- In .*: -23' config.value ./declare-int-between-value.nix ./define-value-int-negative.nix
7674
7775# Check either types
7876# types.either
79−checkConfigOutput "42" config.value ./declare-either.nix ./define-value-int-positive.nix
80−checkConfigOutput "\"24\"" config.value ./declare-either.nix ./define-value-string.nix
77+checkConfigOutput '^42$' config.value ./declare-either.nix ./define-value-int-positive.nix
78+checkConfigOutput '^"24"$' config.value ./declare-either.nix ./define-value-string.nix
8179# types.oneOf
82−checkConfigOutput "42" config.value ./declare-oneOf.nix ./define-value-int-positive.nix
83−checkConfigOutput "[ ]" config.value ./declare-oneOf.nix ./define-value-list.nix
84−checkConfigOutput "\"24\"" config.value ./declare-oneOf.nix ./define-value-string.nix
80+checkConfigOutput '^42$' config.value ./declare-oneOf.nix ./define-value-int-positive.nix
81+checkConfigOutput '^\[ \]$' config.value ./declare-oneOf.nix ./define-value-list.nix
82+checkConfigOutput '^"24"$' config.value ./declare-oneOf.nix ./define-value-string.nix
8583
8684# Check mkForce without submodules.
8785set -- config.enable ./declare-enable.nix ./define-enable.nix
88−checkConfigOutput "true" "$@"
89−checkConfigOutput "false" "$@" ./define-force-enable.nix
90−checkConfigOutput "false" "$@" ./define-enable-force.nix
86+checkConfigOutput '^true$' "$@"
87+checkConfigOutput '^false$' "$@" ./define-force-enable.nix
88+checkConfigOutput '^false$' "$@" ./define-enable-force.nix
9189
9290# Check mkForce with option and submodules.
9391checkConfigError 'attribute .*foo.* .* not found' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix
94−checkConfigOutput 'false' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix
92+checkConfigOutput '^false$' config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix
9593set -- config.attrsOfSub.foo.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo-enable.nix
96−checkConfigOutput 'true' "$@"
97−checkConfigOutput 'false' "$@" ./define-force-attrsOfSub-foo-enable.nix
98−checkConfigOutput 'false' "$@" ./define-attrsOfSub-force-foo-enable.nix
99−checkConfigOutput 'false' "$@" ./define-attrsOfSub-foo-force-enable.nix
100−checkConfigOutput 'false' "$@" ./define-attrsOfSub-foo-enable-force.nix
94+checkConfigOutput '^true$' "$@"
95+checkConfigOutput '^false$' "$@" ./define-force-attrsOfSub-foo-enable.nix
96+checkConfigOutput '^false$' "$@" ./define-attrsOfSub-force-foo-enable.nix
97+checkConfigOutput '^false$' "$@" ./define-attrsOfSub-foo-force-enable.nix
98+checkConfigOutput '^false$' "$@" ./define-attrsOfSub-foo-enable-force.nix
10199
102100# Check overriding effect of mkForce on submodule definitions.
103101checkConfigError 'attribute .*bar.* .* not found' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix
104−checkConfigOutput 'false' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar.nix
102+checkConfigOutput '^false$' config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar.nix
105103set -- config.attrsOfSub.bar.enable ./declare-attrsOfSub-any-enable.nix ./define-attrsOfSub-foo.nix ./define-attrsOfSub-bar-enable.nix
106−checkConfigOutput 'true' "$@"
104+checkConfigOutput '^true$' "$@"
107105checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-force-attrsOfSub-foo-enable.nix
108106checkConfigError 'attribute .*bar.* .* not found' "$@" ./define-attrsOfSub-force-foo-enable.nix
109−checkConfigOutput 'true' "$@" ./define-attrsOfSub-foo-force-enable.nix
110−checkConfigOutput 'true' "$@" ./define-attrsOfSub-foo-enable-force.nix
107+checkConfigOutput '^true$' "$@" ./define-attrsOfSub-foo-force-enable.nix
108+checkConfigOutput '^true$' "$@" ./define-attrsOfSub-foo-enable-force.nix
111109
112110# Check mkIf with submodules.
113111checkConfigError 'attribute .*foo.* .* not found' config.attrsOfSub.foo.enable ./declare-enable.nix ./declare-attrsOfSub-any-enable.nix
@@ -115,16 +113,16 @@ set -- config.attrsOfSub.foo.enable ./declare-enable.nix ./declare-attrsOfSub-an
115113checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-if-attrsOfSub-foo-enable.nix
116114checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-attrsOfSub-if-foo-enable.nix
117115checkConfigError 'attribute .*foo.* .* not found' "$@" ./define-attrsOfSub-foo-if-enable.nix
118−checkConfigOutput 'false' "$@" ./define-attrsOfSub-foo-enable-if.nix
119−checkConfigOutput 'true' "$@" ./define-enable.nix ./define-if-attrsOfSub-foo-enable.nix
120−checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-if-foo-enable.nix
121−checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-if-enable.nix
122−checkConfigOutput 'true' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable-if.nix
116+checkConfigOutput '^false$' "$@" ./define-attrsOfSub-foo-enable-if.nix
117+checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-if-attrsOfSub-foo-enable.nix
118+checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-attrsOfSub-if-foo-enable.nix
119+checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-attrsOfSub-foo-if-enable.nix
120+checkConfigOutput '^true$' "$@" ./define-enable.nix ./define-attrsOfSub-foo-enable-if.nix
123121
124122# Check disabledModules with config definitions and option declarations.
125123set -- config.enable ./define-enable.nix ./declare-enable.nix
126−checkConfigOutput "true" "$@"
127−checkConfigOutput "false" "$@" ./disable-define-enable.nix
124+checkConfigOutput '^true$' "$@"
125+checkConfigOutput '^false$' "$@" ./disable-define-enable.nix
128126checkConfigError "The option .*enable.* does not exist. Definition values:\n\s*- In .*: true" "$@" ./disable-declare-enable.nix
129127checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-define-enable.nix ./disable-declare-enable.nix
130128checkConfigError "attribute .*enable.* in selection path .*config.enable.* not found" "$@" ./disable-enable-modules.nix
@@ -132,7 +130,7 @@ checkConfigError "attribute .*enable.* in selection path .*config.enable.* not f
132130# Check _module.args.
133131set -- config.enable ./declare-enable.nix ./define-enable-with-custom-arg.nix
134132checkConfigError 'while evaluating the module argument .*custom.* in .*define-enable-with-custom-arg.nix.*:' "$@"
135−checkConfigOutput "true" "$@" ./define-_module-args-custom.nix
133+checkConfigOutput '^true$' "$@" ./define-_module-args-custom.nix
136134
137135# Check that using _module.args on imports cause infinite recursions, with
138136# the proper error context.
@@ -143,77 +141,77 @@ checkConfigError 'infinite recursion encountered' "$@"
143141# Check _module.check.
144142set -- config.enable ./declare-enable.nix ./define-enable.nix ./define-attrsOfSub-foo.nix
145143checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*' "$@"
146−checkConfigOutput "true" "$@" ./define-module-check.nix
144+checkConfigOutput '^true$' "$@" ./define-module-check.nix
147145
148146# Check coerced value.
149−checkConfigOutput "\"42\"" config.value ./declare-coerced-value.nix
150−checkConfigOutput "\"24\"" config.value ./declare-coerced-value.nix ./define-value-string.nix
147+checkConfigOutput '^"42"$' config.value ./declare-coerced-value.nix
148+checkConfigOutput '^"24"$' config.value ./declare-coerced-value.nix ./define-value-string.nix
151149checkConfigError 'A definition for option .* is not.*string or signed integer convertible to it.*. Definition values:\n\s*- In .*: \[ \]' config.value ./declare-coerced-value.nix ./define-value-list.nix
152150
153151# Check coerced value with unsound coercion
154−checkConfigOutput "12" config.value ./declare-coerced-value-unsound.nix
152+checkConfigOutput '^12$' config.value ./declare-coerced-value-unsound.nix
155153checkConfigError 'A definition for option .* is not of type .*. Definition values:\n\s*- In .*: "1000"' config.value ./declare-coerced-value-unsound.nix ./define-value-string-bigint.nix
156154checkConfigError 'json.exception.parse_error' config.value ./declare-coerced-value-unsound.nix ./define-value-string-arbitrary.nix
157155
158156# Check mkAliasOptionModule.
159−checkConfigOutput "true" config.enable ./alias-with-priority.nix
160−checkConfigOutput "true" config.enableAlias ./alias-with-priority.nix
161−checkConfigOutput "false" config.enable ./alias-with-priority-can-override.nix
162−checkConfigOutput "false" config.enableAlias ./alias-with-priority-can-override.nix
157+checkConfigOutput '^true$' config.enable ./alias-with-priority.nix
158+checkConfigOutput '^true$' config.enableAlias ./alias-with-priority.nix
159+checkConfigOutput '^false$' config.enable ./alias-with-priority-can-override.nix
160+checkConfigOutput '^false$' config.enableAlias ./alias-with-priority-can-override.nix
163161
164162# submoduleWith
165163
166164## specialArgs should work
167−checkConfigOutput "foo" config.submodule.foo ./declare-submoduleWith-special.nix
165+checkConfigOutput '^"foo"$' config.submodule.foo ./declare-submoduleWith-special.nix
168166
169167## shorthandOnlyDefines config behaves as expected
170−checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
168+checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-shorthand.nix
171169checkConfigError 'is not of type `boolean' config.submodule.config ./declare-submoduleWith-shorthand.nix ./define-submoduleWith-noshorthand.nix
172170checkConfigError "You're trying to declare a value of type \`bool'\n\s*rather than an attribute-set for the option" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-shorthand.nix
173−checkConfigOutput "true" config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
171+checkConfigOutput '^true$' config.submodule.config ./declare-submoduleWith-noshorthand.nix ./define-submoduleWith-noshorthand.nix
174172
175173## submoduleWith should merge all modules in one swoop
176−checkConfigOutput "true" config.submodule.inner ./declare-submoduleWith-modules.nix
177−checkConfigOutput "true" config.submodule.outer ./declare-submoduleWith-modules.nix
174+checkConfigOutput '^true$' config.submodule.inner ./declare-submoduleWith-modules.nix
175+checkConfigOutput '^true$' config.submodule.outer ./declare-submoduleWith-modules.nix
178176# Should also be able to evaluate the type name (which evaluates freeformType,
179177# which evaluates all the modules defined by the type)
180−checkConfigOutput "submodule" options.submodule.type.description ./declare-submoduleWith-modules.nix
178+checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-submoduleWith-modules.nix
181179
182180## submodules can be declared using (evalModules {...}).type
183−checkConfigOutput "true" config.submodule.inner ./declare-submodule-via-evalModules.nix
184−checkConfigOutput "true" config.submodule.outer ./declare-submodule-via-evalModules.nix
181+checkConfigOutput '^true$' config.submodule.inner ./declare-submodule-via-evalModules.nix
182+checkConfigOutput '^true$' config.submodule.outer ./declare-submodule-via-evalModules.nix
185183# Should also be able to evaluate the type name (which evaluates freeformType,
186184# which evaluates all the modules defined by the type)
187−checkConfigOutput "submodule" options.submodule.type.description ./declare-submodule-via-evalModules.nix
185+checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-submodule-via-evalModules.nix
188186
189187## Paths should be allowed as values and work as expected
190−checkConfigOutput "true" config.submodule.enable ./declare-submoduleWith-path.nix
188+checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix
191189
192190# Check that disabledModules works recursively and correctly
193−checkConfigOutput "true" config.enable ./disable-recursive/main.nix
194−checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-foo.nix}
195−checkConfigOutput "true" config.enable ./disable-recursive/{main.nix,disable-bar.nix}
191+checkConfigOutput '^true$' config.enable ./disable-recursive/main.nix
192+checkConfigOutput '^true$' config.enable ./disable-recursive/{main.nix,disable-foo.nix}
193+checkConfigOutput '^true$' config.enable ./disable-recursive/{main.nix,disable-bar.nix}
196194checkConfigError 'The option .* does not exist. Definition values:\n\s*- In .*: true' config.enable ./disable-recursive/{main.nix,disable-foo.nix,disable-bar.nix}
197195
198196# Check that imports can depend on derivations
199−checkConfigOutput "true" config.enable ./import-from-store.nix
197+checkConfigOutput '^true$' config.enable ./import-from-store.nix
200198
201199# Check that configs can be conditional on option existence
202−checkConfigOutput true config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
203−checkConfigOutput 360 config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
204−checkConfigOutput 7 config.value ./define-option-dependently.nix ./declare-int-positive-value.nix
205−checkConfigOutput true config.set.enable ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
206−checkConfigOutput 360 config.set.value ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
207−checkConfigOutput 7 config.set.value ./define-option-dependently-nested.nix ./declare-int-positive-value-nested.nix
200+checkConfigOutput '^true$' config.enable ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
201+checkConfigOutput '^360$' config.value ./define-option-dependently.nix ./declare-enable.nix ./declare-int-positive-value.nix
202+checkConfigOutput '^7$' config.value ./define-option-dependently.nix ./declare-int-positive-value.nix
203+checkConfigOutput '^true$' config.set.enable ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
204+checkConfigOutput '^360$' config.set.value ./define-option-dependently-nested.nix ./declare-enable-nested.nix ./declare-int-positive-value-nested.nix
205+checkConfigOutput '^7$' config.set.value ./define-option-dependently-nested.nix ./declare-int-positive-value-nested.nix
208206
209207# Check attrsOf and lazyAttrsOf. Only lazyAttrsOf should be lazy, and only
210208# attrsOf should work with conditional definitions
211209# In addition, lazyAttrsOf should honor an options emptyValue
212210checkConfigError "is not lazy" config.isLazy ./declare-attrsOf.nix ./attrsOf-lazy-check.nix
213−checkConfigOutput "true" config.isLazy ./declare-lazyAttrsOf.nix ./attrsOf-lazy-check.nix
214−checkConfigOutput "true" config.conditionalWorks ./declare-attrsOf.nix ./attrsOf-conditional-check.nix
215−checkConfigOutput "false" config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
216−checkConfigOutput "empty" config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
211+checkConfigOutput '^true$' config.isLazy ./declare-lazyAttrsOf.nix ./attrsOf-lazy-check.nix
212+checkConfigOutput '^true$' config.conditionalWorks ./declare-attrsOf.nix ./attrsOf-conditional-check.nix
213+checkConfigOutput '^false$' config.conditionalWorks ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
214+checkConfigOutput '^"empty"$' config.value.foo ./declare-lazyAttrsOf.nix ./attrsOf-conditional-check.nix
217215
218216
219217# Even with multiple assignments, a type error should be thrown if any of them aren't valid
@@ -222,69 +220,69 @@ checkConfigError 'A definition for option .* is not of type .*' \
222220
223221## Freeform modules
224222# Assigning without a declared option should work
225−checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix
223+checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix
226224# No freeform assigments shouldn't make it error
227−checkConfigOutput '{ }' config ./freeform-attrsOf.nix
225+checkConfigOutput '^{ }$' config ./freeform-attrsOf.nix
228226# but only if the type matches
229227checkConfigError 'A definition for option .* is not of type .*' config.value ./freeform-attrsOf.nix ./define-value-list.nix
230228# and properties should be applied
231−checkConfigOutput yes config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix
229+checkConfigOutput '^"yes"$' config.value ./freeform-attrsOf.nix ./define-value-string-properties.nix
232230# Options should still be declarable, and be able to have a type that doesn't match the freeform type
233−checkConfigOutput false config.enable ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
234−checkConfigOutput 24 config.value ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
231+checkConfigOutput '^false$' config.enable ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
232+checkConfigOutput '^"24"$' config.value ./freeform-attrsOf.nix ./define-value-string.nix ./declare-enable.nix
235233# and this should work too with nested values
236−checkConfigOutput false config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix
237−checkConfigOutput bar config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix
234+checkConfigOutput '^false$' config.nest.foo ./freeform-attrsOf.nix ./freeform-nested.nix
235+checkConfigOutput '^"bar"$' config.nest.bar ./freeform-attrsOf.nix ./freeform-nested.nix
238236# Check whether a declared option can depend on an freeform-typed one
239−checkConfigOutput null config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix
240−checkConfigOutput 24 config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
237+checkConfigOutput '^null$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix
238+checkConfigOutput '^"24"$' config.foo ./freeform-attrsOf.nix ./freeform-str-dep-unstr.nix ./define-value-string.nix
241239# Check whether an freeform-typed value can depend on a declared option, this can only work with lazyAttrsOf
242240checkConfigError 'infinite recursion encountered' config.foo ./freeform-attrsOf.nix ./freeform-unstr-dep-str.nix
243241checkConfigError 'The option .* is used but not defined' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix
244−checkConfigOutput 24 config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
242+checkConfigOutput '^"24"$' config.foo ./freeform-lazyAttrsOf.nix ./freeform-unstr-dep-str.nix ./define-value-string.nix
245243
246244## types.anything
247245# Check that attribute sets are merged recursively
248−checkConfigOutput null config.value.foo ./types-anything/nested-attrs.nix
249−checkConfigOutput null config.value.l1.foo ./types-anything/nested-attrs.nix
250−checkConfigOutput null config.value.l1.l2.foo ./types-anything/nested-attrs.nix
251−checkConfigOutput null config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix
246+checkConfigOutput '^null$' config.value.foo ./types-anything/nested-attrs.nix
247+checkConfigOutput '^null$' config.value.l1.foo ./types-anything/nested-attrs.nix
248+checkConfigOutput '^null$' config.value.l1.l2.foo ./types-anything/nested-attrs.nix
249+checkConfigOutput '^null$' config.value.l1.l2.l3.foo ./types-anything/nested-attrs.nix
252250# Attribute sets that are coercible to strings shouldn't be recursed into
253−checkConfigOutput foo config.value.outPath ./types-anything/attrs-coercible.nix
251+checkConfigOutput '^"foo"$' config.value.outPath ./types-anything/attrs-coercible.nix
254252# Multiple lists aren't concatenated together
255253checkConfigError 'The option .* has conflicting definitions' config.value ./types-anything/lists.nix
256254# Check that all equalizable atoms can be used as long as all definitions are equal
257−checkConfigOutput 0 config.value.int ./types-anything/equal-atoms.nix
258−checkConfigOutput false config.value.bool ./types-anything/equal-atoms.nix
259−checkConfigOutput '""' config.value.string ./types-anything/equal-atoms.nix
260−checkConfigOutput / config.value.path ./types-anything/equal-atoms.nix
261−checkConfigOutput null config.value.null ./types-anything/equal-atoms.nix
262−checkConfigOutput 0.1 config.value.float ./types-anything/equal-atoms.nix
255+checkConfigOutput '^0$' config.value.int ./types-anything/equal-atoms.nix
256+checkConfigOutput '^false$' config.value.bool ./types-anything/equal-atoms.nix
257+checkConfigOutput '^""$' config.value.string ./types-anything/equal-atoms.nix
258+checkConfigOutput '^/$' config.value.path ./types-anything/equal-atoms.nix
259+checkConfigOutput '^null$' config.value.null ./types-anything/equal-atoms.nix
260+checkConfigOutput '^0.1$' config.value.float ./types-anything/equal-atoms.nix
263261# Functions can't be merged together
264262checkConfigError "The option .value.multiple-lambdas.<function body>. has conflicting option types" config.applied.multiple-lambdas ./types-anything/functions.nix
265−checkConfigOutput '<LAMBDA>' config.value.single-lambda ./types-anything/functions.nix
266−checkConfigOutput 'null' config.applied.merging-lambdas.x ./types-anything/functions.nix
267−checkConfigOutput 'null' config.applied.merging-lambdas.y ./types-anything/functions.nix
263+checkConfigOutput '^<LAMBDA>$' config.value.single-lambda ./types-anything/functions.nix
264+checkConfigOutput '^null$' config.applied.merging-lambdas.x ./types-anything/functions.nix
265+checkConfigOutput '^null$' config.applied.merging-lambdas.y ./types-anything/functions.nix
268266# Check that all mk* modifiers are applied
269267checkConfigError 'attribute .* not found' config.value.mkiffalse ./types-anything/mk-mods.nix
270−checkConfigOutput '{ }' config.value.mkiftrue ./types-anything/mk-mods.nix
271−checkConfigOutput 1 config.value.mkdefault ./types-anything/mk-mods.nix
272−checkConfigOutput '{ }' config.value.mkmerge ./types-anything/mk-mods.nix
273−checkConfigOutput true config.value.mkbefore ./types-anything/mk-mods.nix
274−checkConfigOutput 1 config.value.nested.foo ./types-anything/mk-mods.nix
275−checkConfigOutput baz config.value.nested.bar.baz ./types-anything/mk-mods.nix
268+checkConfigOutput '^{ }$' config.value.mkiftrue ./types-anything/mk-mods.nix
269+checkConfigOutput '^1$' config.value.mkdefault ./types-anything/mk-mods.nix
270+checkConfigOutput '^{ }$' config.value.mkmerge ./types-anything/mk-mods.nix
271+checkConfigOutput '^true$' config.value.mkbefore ./types-anything/mk-mods.nix
272+checkConfigOutput '^1$' config.value.nested.foo ./types-anything/mk-mods.nix
273+checkConfigOutput '^"baz"$' config.value.nested.bar.baz ./types-anything/mk-mods.nix
276274
277275## types.functionTo
278−checkConfigOutput "input is input" config.result ./functionTo/trivial.nix
279−checkConfigOutput "a b" config.result ./functionTo/merging-list.nix
276+checkConfigOutput '^"input is input"$' config.result ./functionTo/trivial.nix
277+checkConfigOutput '^"a b"$' config.result ./functionTo/merging-list.nix
280278checkConfigError 'A definition for option .fun.\[function body\]. is not of type .string.. Definition values:\n\s*- In .*wrong-type.nix' config.result ./functionTo/wrong-type.nix
281−checkConfigOutput "b a" config.result ./functionTo/list-order.nix
282−checkConfigOutput "a c" config.result ./functionTo/merging-attrs.nix
279+checkConfigOutput '^"b a"$' config.result ./functionTo/list-order.nix
280+checkConfigOutput '^"a c"$' config.result ./functionTo/merging-attrs.nix
283281
284282# moduleType
285−checkConfigOutput "a b" config.resultFoo ./declare-variants.nix ./define-variant.nix
286−checkConfigOutput "a y z" config.resultFooBar ./declare-variants.nix ./define-variant.nix
287−checkConfigOutput "a b c" config.resultFooFoo ./declare-variants.nix ./define-variant.nix
283+checkConfigOutput '^"a b"$' config.resultFoo ./declare-variants.nix ./define-variant.nix
284+checkConfigOutput '^"a y z"$' config.resultFooBar ./declare-variants.nix ./define-variant.nix
285+checkConfigOutput '^"a b c"$' config.resultFooFoo ./declare-variants.nix ./define-variant.nix
288286
289287cat <<EOF
290288====== module tests ======
@@ -292,7 +290,7 @@ $pass Pass
292290$fail Fail
293291EOF
294292
295−if test $fail -ne 0; then
293+if [ "$fail" -ne 0 ]; then
296294 exit 1
297295fi
298296exit 0