From daefbb8a4469eba6137a8729311c11348476b25f Mon Sep 17 00:00:00 2001
From: piegames <git@piegames.de>
Date: Mon, 17 Nov 2025 20:17:16 +0100
Subject: [PATCH] tests/functional2/lang: Migrate more builtins

Change-Id: Ib981a5c544748475cf98a8daae0609a52c9c6eb9
---
 .../functional/lang/eval-okay-closure.exp.xml | 343 ------------------
 .../lang/builtins.add/eval-okay.out.exp}      |   0
 .../lang/builtins.add/in.nix}                 |   0
 .../eval-okay.out.exp}                        |   0
 .../lang/builtins.genericClosure/in.nix}      |   0
 .../builtins.removeAttrs/eval-okay-2.out.exp} |   0
 .../lang/builtins.removeAttrs/in-2.nix}       |   0
 .../lang/builtins/eval-okay.out.exp}          |   0
 .../lang/builtins/in.nix}                     |   0
 9 files changed, 343 deletions(-)
 delete mode 100644 tests/functional/lang/eval-okay-closure.exp.xml
 rename tests/{functional/lang/eval-okay-builtins-add.exp => functional2/lang/builtins.add/eval-okay.out.exp} (100%)
 rename tests/{functional/lang/eval-okay-builtins-add.nix => functional2/lang/builtins.add/in.nix} (100%)
 rename tests/{functional/lang/eval-okay-closure.exp => functional2/lang/builtins.genericClosure/eval-okay.out.exp} (100%)
 rename tests/{functional/lang/eval-okay-closure.nix => functional2/lang/builtins.genericClosure/in.nix} (100%)
 rename tests/{functional/lang/eval-okay-remove.exp => functional2/lang/builtins.removeAttrs/eval-okay-2.out.exp} (100%)
 rename tests/{functional/lang/eval-okay-remove.nix => functional2/lang/builtins.removeAttrs/in-2.nix} (100%)
 rename tests/{functional/lang/eval-okay-builtins.exp => functional2/lang/builtins/eval-okay.out.exp} (100%)
 rename tests/{functional/lang/eval-okay-builtins.nix => functional2/lang/builtins/in.nix} (100%)

diff --git a/tests/functional/lang/eval-okay-closure.exp.xml b/tests/functional/lang/eval-okay-closure.exp.xml
deleted file mode 100644
index dffc03a99..000000000
--- a/tests/functional/lang/eval-okay-closure.exp.xml
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <list>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-13" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-12" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-11" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-9" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-8" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-7" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-5" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-4" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="-3" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="-1" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="0" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="1" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="2" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="4" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="5" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="6" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="8" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="9" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="10" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="13" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="14" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="15" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="17" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="18" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="19" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="22" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="23" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="26" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="27" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="28" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="31" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="32" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="35" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="36" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="40" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="41" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="44" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="45" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="49" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="53" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="54" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="58" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="62" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="foo">
-        <bool value="true" />
-      </attr>
-      <attr name="key">
-        <int value="67" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="71" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="key">
-        <int value="80" />
-      </attr>
-    </attrs>
-  </list>
-</expr>
diff --git a/tests/functional/lang/eval-okay-builtins-add.exp b/tests/functional2/lang/builtins.add/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-builtins-add.exp
rename to tests/functional2/lang/builtins.add/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-builtins-add.nix b/tests/functional2/lang/builtins.add/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-builtins-add.nix
rename to tests/functional2/lang/builtins.add/in.nix
diff --git a/tests/functional/lang/eval-okay-closure.exp b/tests/functional2/lang/builtins.genericClosure/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-closure.exp
rename to tests/functional2/lang/builtins.genericClosure/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-closure.nix b/tests/functional2/lang/builtins.genericClosure/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-closure.nix
rename to tests/functional2/lang/builtins.genericClosure/in.nix
diff --git a/tests/functional/lang/eval-okay-remove.exp b/tests/functional2/lang/builtins.removeAttrs/eval-okay-2.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-remove.exp
rename to tests/functional2/lang/builtins.removeAttrs/eval-okay-2.out.exp
diff --git a/tests/functional/lang/eval-okay-remove.nix b/tests/functional2/lang/builtins.removeAttrs/in-2.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-remove.nix
rename to tests/functional2/lang/builtins.removeAttrs/in-2.nix
diff --git a/tests/functional/lang/eval-okay-builtins.exp b/tests/functional2/lang/builtins/eval-okay.out.exp
similarity index 100%
rename from tests/functional/lang/eval-okay-builtins.exp
rename to tests/functional2/lang/builtins/eval-okay.out.exp
diff --git a/tests/functional/lang/eval-okay-builtins.nix b/tests/functional2/lang/builtins/in.nix
similarity index 100%
rename from tests/functional/lang/eval-okay-builtins.nix
rename to tests/functional2/lang/builtins/in.nix