From 6da351929744863686bf81771242d796653d018c Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Tue, 18 Nov 2025 21:12:21 +0100
Subject: [PATCH] tests/functional2/lang: Move some tests around

Change-Id: I7d87c6c210015b33091876e6656f7c0116bc12ea
---
 .../eval-fail-negative.err.exp}                                 | 0
 .../in.nix => builtins.fetchtree/in-negative.nix}               | 2 +-
 .../eval-fail-negative-integer.err.exp                          | 0
 .../eval-okay.out.exp                                           | 0
 .../in-negative-integer.nix                                     | 0
 .../{flake-ref-to-string => builtins.flakeRefToString}/in.nix   | 0
 .../eval-fail-throw-not.err.exp}                                | 0
 .../lang/{not-throws/in.nix => builtins.throw/in-throw-not.nix} | 0
 .../eval-fail-infrec.err.exp}                                   | 0
 .../eval-fail-mutrec.err.exp}                                   | 0
 .../in.nix => function-recursion/in-infrec.nix}                 | 0
 .../in.nix => function-recursion/in-mutrec.nix}                 | 0
 .../eval-fail.err.exp => path/eval-fail-nonexist.err.exp}       | 0
 .../eval-okay-string-interpolation.out.exp}                     | 0
 .../lang/{nonexist-path/in.nix => path/in-nonexist.nix}         | 0
 .../in.nix => path/in-string-interpolation.nix}                 | 0
 .../lang/{path-slash/in.nix => path/in-trailing-slash.nix}      | 0
 .../parse-fail-trailing-slash.err.exp}                          | 0
 18 files changed, 1 insertion(+), 1 deletion(-)
 rename tests/functional2/lang/{fetchTree-negative/eval-fail.err.exp => builtins.fetchtree/eval-fail-negative.err.exp} (100%)
 rename tests/functional2/lang/{fetchTree-negative/in.nix => builtins.fetchtree/in-negative.nix} (51%)
 rename tests/functional2/lang/{flake-ref-to-string => builtins.flakeRefToString}/eval-fail-negative-integer.err.exp (100%)
 rename tests/functional2/lang/{flake-ref-to-string => builtins.flakeRefToString}/eval-okay.out.exp (100%)
 rename tests/functional2/lang/{flake-ref-to-string => builtins.flakeRefToString}/in-negative-integer.nix (100%)
 rename tests/functional2/lang/{flake-ref-to-string => builtins.flakeRefToString}/in.nix (100%)
 rename tests/functional2/lang/{not-throws/eval-fail.err.exp => builtins.throw/eval-fail-throw-not.err.exp} (100%)
 rename tests/functional2/lang/{not-throws/in.nix => builtins.throw/in-throw-not.nix} (100%)
 rename tests/functional2/lang/{infinite-recursion-lambda/eval-fail.err.exp => function-recursion/eval-fail-infrec.err.exp} (100%)
 rename tests/functional2/lang/{mutual-recursion/eval-fail.err.exp => function-recursion/eval-fail-mutrec.err.exp} (100%)
 rename tests/functional2/lang/{infinite-recursion-lambda/in.nix => function-recursion/in-infrec.nix} (100%)
 rename tests/functional2/lang/{mutual-recursion/in.nix => function-recursion/in-mutrec.nix} (100%)
 rename tests/functional2/lang/{nonexist-path/eval-fail.err.exp => path/eval-fail-nonexist.err.exp} (100%)
 rename tests/functional2/lang/{path-string-interpolation/eval-okay.out.exp => path/eval-okay-string-interpolation.out.exp} (100%)
 rename tests/functional2/lang/{nonexist-path/in.nix => path/in-nonexist.nix} (100%)
 rename tests/functional2/lang/{path-string-interpolation/in.nix => path/in-string-interpolation.nix} (100%)
 rename tests/functional2/lang/{path-slash/in.nix => path/in-trailing-slash.nix} (100%)
 rename tests/functional2/lang/{path-slash/parse-fail.err.exp => path/parse-fail-trailing-slash.err.exp} (100%)

diff --git a/tests/functional2/lang/fetchTree-negative/eval-fail.err.exp b/tests/functional2/lang/builtins.fetchtree/eval-fail-negative.err.exp
similarity index 100%
rename from tests/functional2/lang/fetchTree-negative/eval-fail.err.exp
rename to tests/functional2/lang/builtins.fetchtree/eval-fail-negative.err.exp
diff --git a/tests/functional2/lang/fetchTree-negative/in.nix b/tests/functional2/lang/builtins.fetchtree/in-negative.nix
similarity index 51%
rename from tests/functional2/lang/fetchTree-negative/in.nix
rename to tests/functional2/lang/builtins.fetchtree/in-negative.nix
index 90bcab5d8..cc6384099 100644
--- a/tests/functional2/lang/fetchTree-negative/in.nix
+++ b/tests/functional2/lang/builtins.fetchtree/in-negative.nix
@@ -1,5 +1,5 @@
 builtins.fetchTree {
   type = "file";
-  url = "file://eval-fail-fetchTree-negative.nix";
+  url = "file://in-negative.nix";
   owner = -1;
 }
diff --git a/tests/functional2/lang/flake-ref-to-string/eval-fail-negative-integer.err.exp b/tests/functional2/lang/builtins.flakeRefToString/eval-fail-negative-integer.err.exp
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/eval-fail-negative-integer.err.exp
rename to tests/functional2/lang/builtins.flakeRefToString/eval-fail-negative-integer.err.exp
diff --git a/tests/functional2/lang/flake-ref-to-string/eval-okay.out.exp b/tests/functional2/lang/builtins.flakeRefToString/eval-okay.out.exp
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/eval-okay.out.exp
rename to tests/functional2/lang/builtins.flakeRefToString/eval-okay.out.exp
diff --git a/tests/functional2/lang/flake-ref-to-string/in-negative-integer.nix b/tests/functional2/lang/builtins.flakeRefToString/in-negative-integer.nix
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/in-negative-integer.nix
rename to tests/functional2/lang/builtins.flakeRefToString/in-negative-integer.nix
diff --git a/tests/functional2/lang/flake-ref-to-string/in.nix b/tests/functional2/lang/builtins.flakeRefToString/in.nix
similarity index 100%
rename from tests/functional2/lang/flake-ref-to-string/in.nix
rename to tests/functional2/lang/builtins.flakeRefToString/in.nix
diff --git a/tests/functional2/lang/not-throws/eval-fail.err.exp b/tests/functional2/lang/builtins.throw/eval-fail-throw-not.err.exp
similarity index 100%
rename from tests/functional2/lang/not-throws/eval-fail.err.exp
rename to tests/functional2/lang/builtins.throw/eval-fail-throw-not.err.exp
diff --git a/tests/functional2/lang/not-throws/in.nix b/tests/functional2/lang/builtins.throw/in-throw-not.nix
similarity index 100%
rename from tests/functional2/lang/not-throws/in.nix
rename to tests/functional2/lang/builtins.throw/in-throw-not.nix
diff --git a/tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp b/tests/functional2/lang/function-recursion/eval-fail-infrec.err.exp
similarity index 100%
rename from tests/functional2/lang/infinite-recursion-lambda/eval-fail.err.exp
rename to tests/functional2/lang/function-recursion/eval-fail-infrec.err.exp
diff --git a/tests/functional2/lang/mutual-recursion/eval-fail.err.exp b/tests/functional2/lang/function-recursion/eval-fail-mutrec.err.exp
similarity index 100%
rename from tests/functional2/lang/mutual-recursion/eval-fail.err.exp
rename to tests/functional2/lang/function-recursion/eval-fail-mutrec.err.exp
diff --git a/tests/functional2/lang/infinite-recursion-lambda/in.nix b/tests/functional2/lang/function-recursion/in-infrec.nix
similarity index 100%
rename from tests/functional2/lang/infinite-recursion-lambda/in.nix
rename to tests/functional2/lang/function-recursion/in-infrec.nix
diff --git a/tests/functional2/lang/mutual-recursion/in.nix b/tests/functional2/lang/function-recursion/in-mutrec.nix
similarity index 100%
rename from tests/functional2/lang/mutual-recursion/in.nix
rename to tests/functional2/lang/function-recursion/in-mutrec.nix
diff --git a/tests/functional2/lang/nonexist-path/eval-fail.err.exp b/tests/functional2/lang/path/eval-fail-nonexist.err.exp
similarity index 100%
rename from tests/functional2/lang/nonexist-path/eval-fail.err.exp
rename to tests/functional2/lang/path/eval-fail-nonexist.err.exp
diff --git a/tests/functional2/lang/path-string-interpolation/eval-okay.out.exp b/tests/functional2/lang/path/eval-okay-string-interpolation.out.exp
similarity index 100%
rename from tests/functional2/lang/path-string-interpolation/eval-okay.out.exp
rename to tests/functional2/lang/path/eval-okay-string-interpolation.out.exp
diff --git a/tests/functional2/lang/nonexist-path/in.nix b/tests/functional2/lang/path/in-nonexist.nix
similarity index 100%
rename from tests/functional2/lang/nonexist-path/in.nix
rename to tests/functional2/lang/path/in-nonexist.nix
diff --git a/tests/functional2/lang/path-string-interpolation/in.nix b/tests/functional2/lang/path/in-string-interpolation.nix
similarity index 100%
rename from tests/functional2/lang/path-string-interpolation/in.nix
rename to tests/functional2/lang/path/in-string-interpolation.nix
diff --git a/tests/functional2/lang/path-slash/in.nix b/tests/functional2/lang/path/in-trailing-slash.nix
similarity index 100%
rename from tests/functional2/lang/path-slash/in.nix
rename to tests/functional2/lang/path/in-trailing-slash.nix
diff --git a/tests/functional2/lang/path-slash/parse-fail.err.exp b/tests/functional2/lang/path/parse-fail-trailing-slash.err.exp
similarity index 100%
rename from tests/functional2/lang/path-slash/parse-fail.err.exp
rename to tests/functional2/lang/path/parse-fail-trailing-slash.err.exp