diff --git a/tests/functional/lang/eval-fail-set-override.flags b/tests/functional/lang/eval-fail-set-override.flags deleted file mode 100644 index a0e513a81..000000000 --- a/tests/functional/lang/eval-fail-set-override.flags +++ /dev/null @@ -1 +0,0 @@ ---extra-deprecated-features rec-set-overrides diff --git a/tests/functional/lang/eval-okay-overrides.flags b/tests/functional/lang/eval-okay-overrides.flags deleted file mode 100644 index a0e513a81..000000000 --- a/tests/functional/lang/eval-okay-overrides.flags +++ /dev/null @@ -1 +0,0 @@ ---extra-deprecated-features rec-set-overrides diff --git a/tests/functional/lang/parse-okay-rec-set-override-nowarning.exp b/tests/functional/lang/parse-okay-rec-set-override-nowarning.exp deleted file mode 120000 index 687e738ee..000000000 --- a/tests/functional/lang/parse-okay-rec-set-override-nowarning.exp +++ /dev/null @@ -1 +0,0 @@ -parse-okay-rec-set-override-warning.exp \ No newline at end of file diff --git a/tests/functional/lang/parse-okay-rec-set-override-nowarning.flags b/tests/functional/lang/parse-okay-rec-set-override-nowarning.flags deleted file mode 100644 index a0e513a81..000000000 --- a/tests/functional/lang/parse-okay-rec-set-override-nowarning.flags +++ /dev/null @@ -1 +0,0 @@ ---extra-deprecated-features rec-set-overrides diff --git a/tests/functional/lang/parse-okay-rec-set-override-nowarning.nix b/tests/functional/lang/parse-okay-rec-set-override-nowarning.nix deleted file mode 120000 index f92d1596f..000000000 --- a/tests/functional/lang/parse-okay-rec-set-override-nowarning.nix +++ /dev/null @@ -1 +0,0 @@ -parse-okay-rec-set-override-warning.nix \ No newline at end of file diff --git a/tests/functional/lang/eval-fail-set-override.err.exp b/tests/functional2/lang/rec-set-overrides/eval-fail-2.err.exp similarity index 100% rename from tests/functional/lang/eval-fail-set-override.err.exp rename to tests/functional2/lang/rec-set-overrides/eval-fail-2.err.exp diff --git a/tests/functional/lang/eval-okay-overrides.exp b/tests/functional2/lang/rec-set-overrides/eval-okay-3.out.exp similarity index 100% rename from tests/functional/lang/eval-okay-overrides.exp rename to tests/functional2/lang/rec-set-overrides/eval-okay-3.out.exp diff --git a/tests/functional/lang/eval-fail-set-override.nix b/tests/functional2/lang/rec-set-overrides/in-2.nix similarity index 100% rename from tests/functional/lang/eval-fail-set-override.nix rename to tests/functional2/lang/rec-set-overrides/in-2.nix diff --git a/tests/functional/lang/eval-okay-overrides.nix b/tests/functional2/lang/rec-set-overrides/in-3.nix similarity index 100% rename from tests/functional/lang/eval-okay-overrides.nix rename to tests/functional2/lang/rec-set-overrides/in-3.nix diff --git a/tests/functional/lang/parse-okay-rec-set-override-warning.nix b/tests/functional2/lang/rec-set-overrides/in.nix similarity index 100% rename from tests/functional/lang/parse-okay-rec-set-override-warning.nix rename to tests/functional2/lang/rec-set-overrides/in.nix diff --git a/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp b/tests/functional2/lang/rec-set-overrides/parse-okay-deprecation-warning.err.exp similarity index 84% rename from tests/functional/lang/parse-okay-rec-set-override-warning.err.exp rename to tests/functional2/lang/rec-set-overrides/parse-okay-deprecation-warning.err.exp index 5e043d404..21f3dc81e 100644 --- a/tests/functional/lang/parse-okay-rec-set-override-warning.err.exp +++ b/tests/functional2/lang/rec-set-overrides/parse-okay-deprecation-warning.err.exp @@ -1,11 +1,11 @@ warning: __overrides attributes are deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning. - at /pwd/parse-okay-rec-set-override-warning.nix:3:17: + at /pwd/in.nix:3:17: 2| # Should warn 3| { a = rec {}; a.__overrides = {}; } | ^ 4| rec { __overrides = {}; } warning: __overrides attributes are deprecated and will be removed in the future. Use --extra-deprecated-features rec-set-overrides to silence this warning. - at /pwd/parse-okay-rec-set-override-warning.nix:4:9: + at /pwd/in.nix:4:9: 3| { a = rec {}; a.__overrides = {}; } 4| rec { __overrides = {}; } | ^ diff --git a/tests/functional/lang/parse-okay-rec-set-override-warning.exp b/tests/functional2/lang/rec-set-overrides/parse-okay-deprecation-warning.out.exp similarity index 100% rename from tests/functional/lang/parse-okay-rec-set-override-warning.exp rename to tests/functional2/lang/rec-set-overrides/parse-okay-deprecation-warning.out.exp diff --git a/tests/functional2/lang/rec-set-overrides/parse-okay.out.exp b/tests/functional2/lang/rec-set-overrides/parse-okay.out.exp new file mode 100644 index 000000000..2d1ea55cc --- /dev/null +++ b/tests/functional2/lang/rec-set-overrides/parse-okay.out.exp @@ -0,0 +1,40 @@ +_type: ExprList +elems: + - _type: ExprSet + attrs: + a: + _type: ExprSet + attrs: + __overrides: + _type: ExprSet + recursive: false + recursive: true + recursive: false + - _type: ExprSet + attrs: + __overrides: + _type: ExprSet + recursive: false + recursive: true + - _type: ExprSet + attrs: + __overrides: + _type: ExprSet + recursive: false + recursive: false + - _type: ExprSet + dynamicAttrs: + - name: + _type: ExprConcatStrings + es: + - _type: ExprLiteral + value: __overrides + valueType: String + - _type: ExprLiteral + value: '' + valueType: String + isInterpolation: false + value: + _type: ExprSet + recursive: false + recursive: true diff --git a/tests/functional2/lang/rec-set-overrides/test.toml b/tests/functional2/lang/rec-set-overrides/test.toml new file mode 100644 index 000000000..11f53da01 --- /dev/null +++ b/tests/functional2/lang/rec-set-overrides/test.toml @@ -0,0 +1,18 @@ +[[test]] +runner = "parse-okay" +flags = [ "--extra-deprecated-features", "rec-set-overrides" ] + +# Same as above but with deprecation warning +[[test]] +name = "parse-okay-deprecation-warning" +runner = "parse-okay" + +[[test]] +runner = "eval-fail" +in = "in-2.nix" +flags = [ "--extra-deprecated-features", "rec-set-overrides" ] + +[[test]] +runner = "eval-okay" +in = "in-3.nix" +flags = [ "--extra-deprecated-features", "rec-set-overrides" ]