From 0fec7d2db6d7f05ab228f12a6b57b2cd4a64276b Mon Sep 17 00:00:00 2001 From: Rebecca Turner Date: Thu, 4 Apr 2024 15:42:47 -0700 Subject: [PATCH] Rename some parse failure tests to `parse-fail-*` These were mistakenly labeled `eval-fail-*`. Note that the `lang.sh` runner passes `parse-fail-*` tests on stdin, so filenames are removed from error messages. Change-Id: I7f3a0d78b6cfa87af29aaa1b7af19d5a57fd4ade --- .../lang/{eval-fail-eol-1.err.exp => parse-fail-eol-1.err.exp} | 2 +- .../lang/{eval-fail-eol-1.nix => parse-fail-eol-1.nix} | 0 .../lang/{eval-fail-eol-2.err.exp => parse-fail-eol-2.err.exp} | 2 +- .../lang/{eval-fail-eol-2.nix => parse-fail-eol-2.nix} | 0 .../lang/{eval-fail-eol-3.err.exp => parse-fail-eol-3.err.exp} | 2 +- .../lang/{eval-fail-eol-3.nix => parse-fail-eol-3.nix} | 0 ...al-fail-path-slash.err.exp => parse-fail-path-slash.err.exp} | 2 +- .../{eval-fail-path-slash.nix => parse-fail-path-slash.nix} | 0 .../lang/{eval-fail-set.err.exp => parse-fail-set.err.exp} | 2 +- tests/functional/lang/{eval-fail-set.nix => parse-fail-set.nix} | 0 10 files changed, 5 insertions(+), 5 deletions(-) rename tests/functional/lang/{eval-fail-eol-1.err.exp => parse-fail-eol-1.err.exp} (72%) rename tests/functional/lang/{eval-fail-eol-1.nix => parse-fail-eol-1.nix} (100%) rename tests/functional/lang/{eval-fail-eol-2.err.exp => parse-fail-eol-2.err.exp} (72%) rename tests/functional/lang/{eval-fail-eol-2.nix => parse-fail-eol-2.nix} (100%) rename tests/functional/lang/{eval-fail-eol-3.err.exp => parse-fail-eol-3.err.exp} (72%) rename tests/functional/lang/{eval-fail-eol-3.nix => parse-fail-eol-3.nix} (100%) rename tests/functional/lang/{eval-fail-path-slash.err.exp => parse-fail-path-slash.err.exp} (77%) rename tests/functional/lang/{eval-fail-path-slash.nix => parse-fail-path-slash.nix} (100%) rename tests/functional/lang/{eval-fail-set.err.exp => parse-fail-set.err.exp} (65%) rename tests/functional/lang/{eval-fail-set.nix => parse-fail-set.nix} (100%) diff --git a/tests/functional/lang/eval-fail-eol-1.err.exp b/tests/functional/lang/parse-fail-eol-1.err.exp similarity index 72% rename from tests/functional/lang/eval-fail-eol-1.err.exp rename to 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 similarity index 100% rename from tests/functional/lang/eval-fail-eol-1.nix rename to tests/functional/lang/parse-fail-eol-1.nix diff --git a/tests/functional/lang/eval-fail-eol-2.err.exp b/tests/functional/lang/parse-fail-eol-2.err.exp similarity index 72% rename from tests/functional/lang/eval-fail-eol-2.err.exp rename to tests/functional/lang/parse-fail-eol-2.err.exp index ff13e2d55..f7f79b460 100644 --- a/tests/functional/lang/eval-fail-eol-2.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-2.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 similarity index 100% rename from tests/functional/lang/eval-fail-eol-2.nix rename to tests/functional/lang/parse-fail-eol-2.nix diff --git a/tests/functional/lang/eval-fail-eol-3.err.exp b/tests/functional/lang/parse-fail-eol-3.err.exp similarity index 72% rename from tests/functional/lang/eval-fail-eol-3.err.exp rename to tests/functional/lang/parse-fail-eol-3.err.exp index ada3c5ecd..f7f79b460 100644 --- a/tests/functional/lang/eval-fail-eol-3.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-3.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 similarity index 100% rename from tests/functional/lang/eval-fail-eol-3.nix rename to 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 similarity index 77% rename from tests/functional/lang/eval-fail-path-slash.err.exp rename to 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 similarity index 100% rename from tests/functional/lang/eval-fail-path-slash.nix rename to 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 similarity index 65% rename from tests/functional/lang/eval-fail-set.err.exp rename to 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 similarity index 100% rename from tests/functional/lang/eval-fail-set.nix rename to tests/functional/lang/parse-fail-set.nix