diff options
| author | rebecca “wiggles” turner <rbt@sent.as> | 2024-04-08 06:33:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@lix> | 2024-04-08 06:33:51 +0000 |
| commit | 4600eabdaea3eb850c5f1847fbfd03d7f2dffa81 (patch) | |
| tree | af59cc02aa17acd27472311492ddf353053af859 /tests | |
| parent | 8ed8b9aef08949105fd7a2c4ded71d005e35cec7 (diff) | |
| parent | 0fec7d2db6d7f05ab228f12a6b57b2cd4a64276b (diff) | |
Merge "Rename some parse failure tests to `parse-fail-*`" into main
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/functional/lang/parse-fail-eol-1.err.exp (renamed from tests/functional/lang/eval-fail-eol-1.err.exp) | 2 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-eol-1.nix (renamed from tests/functional/lang/eval-fail-eol-1.nix) | 0 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-eol-2.err.exp (renamed from tests/functional/lang/eval-fail-eol-3.err.exp) | 2 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-eol-2.nix (renamed from tests/functional/lang/eval-fail-eol-2.nix) | 0 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-eol-3.err.exp (renamed from tests/functional/lang/eval-fail-eol-2.err.exp) | 2 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-eol-3.nix (renamed from tests/functional/lang/eval-fail-eol-3.nix) | 0 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-path-slash.err.exp (renamed from tests/functional/lang/eval-fail-path-slash.err.exp) | 2 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-path-slash.nix (renamed from tests/functional/lang/eval-fail-path-slash.nix) | 0 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-set.err.exp (renamed from tests/functional/lang/eval-fail-set.err.exp) | 2 | ||||
| -rw-r--r-- | tests/functional/lang/parse-fail-set.nix (renamed from tests/functional/lang/eval-fail-set.nix) | 0 |
10 files changed, 5 insertions, 5 deletions
diff --git a/tests/functional/lang/eval-fail-eol-1.err.exp b/tests/functional/lang/parse-fail-eol-1.err.exp index 3f5a5c22c..f7f79b460 100644 --- a/tests/functional/lang/eval-fail-eol-1.err.exp +++ b/tests/functional/lang/parse-fail-eol-1.err.exp @@ -1,5 +1,5 @@ error: undefined variable 'invalid' - at /pwd/lang/eval-fail-eol-1.nix:2:1: + at «stdin»:2:1: 1| # foo 2| invalid | ^ diff --git a/tests/functional/lang/eval-fail-eol-1.nix b/tests/functional/lang/parse-fail-eol-1.nix index 476223919..476223919 100644 --- a/tests/functional/lang/eval-fail-eol-1.nix +++ b/tests/functional/lang/parse-fail-eol-1.nix diff --git a/tests/functional/lang/eval-fail-eol-3.err.exp b/tests/functional/lang/parse-fail-eol-2.err.exp index ada3c5ecd..f7f79b460 100644 --- a/tests/functional/lang/eval-fail-eol-3.err.exp +++ b/tests/functional/lang/parse-fail-eol-2.err.exp @@ -1,5 +1,5 @@ error: undefined variable 'invalid' - at /pwd/lang/eval-fail-eol-3.nix:2:1: + at «stdin»:2:1: 1| # foo 2| invalid | ^ diff --git a/tests/functional/lang/eval-fail-eol-2.nix b/tests/functional/lang/parse-fail-eol-2.nix index 0cf92a425..0cf92a425 100644 --- a/tests/functional/lang/eval-fail-eol-2.nix +++ b/tests/functional/lang/parse-fail-eol-2.nix diff --git a/tests/functional/lang/eval-fail-eol-2.err.exp b/tests/functional/lang/parse-fail-eol-3.err.exp index ff13e2d55..f7f79b460 100644 --- a/tests/functional/lang/eval-fail-eol-2.err.exp +++ b/tests/functional/lang/parse-fail-eol-3.err.exp @@ -1,5 +1,5 @@ error: undefined variable 'invalid' - at /pwd/lang/eval-fail-eol-2.nix:2:1: + at «stdin»:2:1: 1| # foo 2| invalid | ^ diff --git a/tests/functional/lang/eval-fail-eol-3.nix b/tests/functional/lang/parse-fail-eol-3.nix index 33422452d..33422452d 100644 --- a/tests/functional/lang/eval-fail-eol-3.nix +++ b/tests/functional/lang/parse-fail-eol-3.nix diff --git a/tests/functional/lang/eval-fail-path-slash.err.exp b/tests/functional/lang/parse-fail-path-slash.err.exp index e3531d352..0407543a1 100644 --- a/tests/functional/lang/eval-fail-path-slash.err.exp +++ b/tests/functional/lang/parse-fail-path-slash.err.exp @@ -1,5 +1,5 @@ error: path has a trailing slash - at /pwd/lang/eval-fail-path-slash.nix:6:12: + at «stdin»:6:12: 5| # and https://nixos.org/nix-dev/2016-June/020829.html 6| /nix/store/ | ^ diff --git a/tests/functional/lang/eval-fail-path-slash.nix b/tests/functional/lang/parse-fail-path-slash.nix index 8c2e104c7..8c2e104c7 100644 --- a/tests/functional/lang/eval-fail-path-slash.nix +++ b/tests/functional/lang/parse-fail-path-slash.nix diff --git a/tests/functional/lang/eval-fail-set.err.exp b/tests/functional/lang/parse-fail-set.err.exp index 6dd646e11..2f77406a7 100644 --- a/tests/functional/lang/eval-fail-set.err.exp +++ b/tests/functional/lang/parse-fail-set.err.exp @@ -1,5 +1,5 @@ error: undefined variable 'x' - at /pwd/lang/eval-fail-set.nix:1:3: + at «stdin»:1:3: 1| 8.x | ^ 2| diff --git a/tests/functional/lang/eval-fail-set.nix b/tests/functional/lang/parse-fail-set.nix index c6b7980b6..c6b7980b6 100644 --- a/tests/functional/lang/eval-fail-set.nix +++ b/tests/functional/lang/parse-fail-set.nix |