From 16db4da8f08e16b4d193ee7bb94e3445acc648b1 Mon Sep 17 00:00:00 2001 From: piegames Date: Tue, 3 Jun 2025 13:40:18 +0200 Subject: [PATCH] tests/functional2/lang: Rename tests Most tests for builtins now have `builtins.builtinName` as their name. This makes navigating the test list a bit easier Change-Id: Ief5af5c568a419bf9130601f9590e7a696b0dc0a --- .../lang/{callable-attrs => __functor}/eval-okay.out.exp | 0 tests/functional2/lang/{callable-attrs => __functor}/in.nix | 0 .../functional2/lang/{abort => builtins.abort}/eval-fail.err.exp | 0 tests/functional2/lang/{abort => builtins.abort}/in.nix | 0 .../lang/{any-all => builtins.any-all}/eval-okay.out.exp | 0 tests/functional2/lang/{any-all => builtins.any-all}/in.nix | 0 .../eval-okay.out.exp | 0 .../{attrnames => builtins.attrNames-getAttr-attrValues}/in.nix | 0 .../lang/{catattrs => builtins.catAttrs}/eval-okay.out.exp | 0 tests/functional2/lang/{catattrs => builtins.catAttrs}/in.nix | 0 .../lang/{concatmap => builtins.concatMap}/eval-okay.out.exp | 0 tests/functional2/lang/{concatmap => builtins.concatMap}/in.nix | 0 .../eval-okay.out.exp | 0 .../lang/{concatstringssep => builtins.concatStringsSep}/in.nix | 0 .../lang/{deepseq => builtins.deepSeq}/eval-fail.err.exp | 0 tests/functional2/lang/{deepseq => builtins.deepSeq}/in.nix | 0 tests/functional2/lang/{elem => builtins.elem}/eval-okay.out.exp | 0 tests/functional2/lang/{elem => builtins.elem}/in.nix | 0 .../lang/{filter => builtins.filter}/eval-okay.out.exp | 0 tests/functional2/lang/{filter => builtins.filter}/in.nix | 0 .../lang/{floor-ceil => builtins.floor-ceil}/eval-okay.out.exp | 0 tests/functional2/lang/{floor-ceil => builtins.floor-ceil}/in.nix | 0 .../lang/{groupBy => builtins.groupBy}/eval-okay.out.exp | 0 tests/functional2/lang/{groupBy => builtins.groupBy}/in.nix | 0 .../lang/{hashstring => builtins.hashString}/eval-okay.out.exp | 0 tests/functional2/lang/{hashstring => builtins.hashString}/in.nix | 0 .../{intersectAttrs => builtins.intersectAttrs}/eval-okay.out.exp | 0 .../lang/{intersectAttrs => builtins.intersectAttrs}/in.nix | 0 .../lang/{listtoattrs => builtins.listToAttrs}/eval-okay.out.exp | 0 .../functional2/lang/{listtoattrs => builtins.listToAttrs}/in.nix | 0 tests/functional2/lang/{map => builtins.map}/eval-okay.out.exp | 0 tests/functional2/lang/{map => builtins.map}/in.nix | 0 .../lang/{mapattrs => builtins.mapAttrs}/eval-okay.out.exp | 0 tests/functional2/lang/{mapattrs => builtins.mapAttrs}/in.nix | 0 .../lang/{regex-match => builtins.matches}/eval-okay.out.exp | 0 tests/functional2/lang/{regex-match => builtins.matches}/in.nix | 0 .../{parse-flake-ref => builtins.parseFlakeRef}/eval-okay.out.exp | 0 .../lang/{parse-flake-ref => builtins.parseFlakeRef}/in.nix | 0 .../lang/{partition => builtins.partition}/eval-okay.out.exp | 0 tests/functional2/lang/{partition => builtins.partition}/in.nix | 0 .../lang/{remove => builtins.removeAttrs}/eval-fail.err.exp | 0 tests/functional2/lang/{remove => builtins.removeAttrs}/in.nix | 0 .../{replacestrings => builtins.replaceStrings}/eval-okay.out.exp | 0 .../lang/{replacestrings => builtins.replaceStrings}/in.nix | 0 tests/functional2/lang/{seq => builtins.seq}/eval-fail.err.exp | 0 tests/functional2/lang/{seq => builtins.seq}/in.nix | 0 tests/functional2/lang/{sort => builtins.sort}/eval-okay.out.exp | 0 tests/functional2/lang/{sort => builtins.sort}/in.nix | 0 .../lang/{regex-split => builtins.split}/eval-okay.out.exp | 0 tests/functional2/lang/{regex-split => builtins.split}/in.nix | 0 .../{splitversion => builtins.splitVersion}/eval-okay.out.exp | 0 .../lang/{splitversion => builtins.splitVersion}/in.nix | 0 .../lang/{substring => builtins.substring}/eval-fail.err.exp | 0 tests/functional2/lang/{substring => builtins.substring}/in.nix | 0 .../lang/{to-path => builtins.toPath}/eval-fail.err.exp | 0 tests/functional2/lang/{to-path => builtins.toPath}/in.nix | 0 .../lang/{toString => builtins.toString}/eval-fail.err.exp | 0 tests/functional2/lang/{toString => builtins.toString}/in.nix | 0 .../lang/{tryeval => builtins.tryEval}/eval-okay.out.exp | 0 tests/functional2/lang/{tryeval => builtins.tryEval}/in.nix | 0 .../{zipAttrsWith => builtins.zipAttrsWith}/eval-okay.out.exp | 0 .../lang/{zipAttrsWith => builtins.zipAttrsWith}/in.nix | 0 tests/functional2/lang/{inherits => inherit}/in.nix | 0 tests/functional2/lang/{inherits => inherit}/parse-okay.out.exp | 0 tests/functional2/lang/{json => parser-output-json}/in.nix | 0 .../lang/{json => parser-output-json}/parse-okay.out.exp | 0 66 files changed, 0 insertions(+), 0 deletions(-) rename tests/functional2/lang/{callable-attrs => __functor}/eval-okay.out.exp (100%) rename tests/functional2/lang/{callable-attrs => __functor}/in.nix (100%) rename tests/functional2/lang/{abort => builtins.abort}/eval-fail.err.exp (100%) rename tests/functional2/lang/{abort => builtins.abort}/in.nix (100%) rename tests/functional2/lang/{any-all => builtins.any-all}/eval-okay.out.exp (100%) rename tests/functional2/lang/{any-all => builtins.any-all}/in.nix (100%) rename tests/functional2/lang/{attrnames => builtins.attrNames-getAttr-attrValues}/eval-okay.out.exp (100%) rename tests/functional2/lang/{attrnames => builtins.attrNames-getAttr-attrValues}/in.nix (100%) rename tests/functional2/lang/{catattrs => builtins.catAttrs}/eval-okay.out.exp (100%) rename tests/functional2/lang/{catattrs => builtins.catAttrs}/in.nix (100%) rename tests/functional2/lang/{concatmap => builtins.concatMap}/eval-okay.out.exp (100%) rename tests/functional2/lang/{concatmap => builtins.concatMap}/in.nix (100%) rename tests/functional2/lang/{concatstringssep => builtins.concatStringsSep}/eval-okay.out.exp (100%) rename tests/functional2/lang/{concatstringssep => builtins.concatStringsSep}/in.nix (100%) rename tests/functional2/lang/{deepseq => builtins.deepSeq}/eval-fail.err.exp (100%) rename tests/functional2/lang/{deepseq => builtins.deepSeq}/in.nix (100%) rename tests/functional2/lang/{elem => builtins.elem}/eval-okay.out.exp (100%) rename tests/functional2/lang/{elem => builtins.elem}/in.nix (100%) rename tests/functional2/lang/{filter => builtins.filter}/eval-okay.out.exp (100%) rename tests/functional2/lang/{filter => builtins.filter}/in.nix (100%) rename tests/functional2/lang/{floor-ceil => builtins.floor-ceil}/eval-okay.out.exp (100%) rename tests/functional2/lang/{floor-ceil => builtins.floor-ceil}/in.nix (100%) rename tests/functional2/lang/{groupBy => builtins.groupBy}/eval-okay.out.exp (100%) rename tests/functional2/lang/{groupBy => builtins.groupBy}/in.nix (100%) rename tests/functional2/lang/{hashstring => builtins.hashString}/eval-okay.out.exp (100%) rename tests/functional2/lang/{hashstring => builtins.hashString}/in.nix (100%) rename tests/functional2/lang/{intersectAttrs => builtins.intersectAttrs}/eval-okay.out.exp (100%) rename tests/functional2/lang/{intersectAttrs => builtins.intersectAttrs}/in.nix (100%) rename tests/functional2/lang/{listtoattrs => builtins.listToAttrs}/eval-okay.out.exp (100%) rename tests/functional2/lang/{listtoattrs => builtins.listToAttrs}/in.nix (100%) rename tests/functional2/lang/{map => builtins.map}/eval-okay.out.exp (100%) rename tests/functional2/lang/{map => builtins.map}/in.nix (100%) rename tests/functional2/lang/{mapattrs => builtins.mapAttrs}/eval-okay.out.exp (100%) rename tests/functional2/lang/{mapattrs => builtins.mapAttrs}/in.nix (100%) rename tests/functional2/lang/{regex-match => builtins.matches}/eval-okay.out.exp (100%) rename tests/functional2/lang/{regex-match => builtins.matches}/in.nix (100%) rename tests/functional2/lang/{parse-flake-ref => builtins.parseFlakeRef}/eval-okay.out.exp (100%) rename tests/functional2/lang/{parse-flake-ref => builtins.parseFlakeRef}/in.nix (100%) rename tests/functional2/lang/{partition => builtins.partition}/eval-okay.out.exp (100%) rename tests/functional2/lang/{partition => builtins.partition}/in.nix (100%) rename tests/functional2/lang/{remove => builtins.removeAttrs}/eval-fail.err.exp (100%) rename tests/functional2/lang/{remove => builtins.removeAttrs}/in.nix (100%) rename tests/functional2/lang/{replacestrings => builtins.replaceStrings}/eval-okay.out.exp (100%) rename tests/functional2/lang/{replacestrings => builtins.replaceStrings}/in.nix (100%) rename tests/functional2/lang/{seq => builtins.seq}/eval-fail.err.exp (100%) rename tests/functional2/lang/{seq => builtins.seq}/in.nix (100%) rename tests/functional2/lang/{sort => builtins.sort}/eval-okay.out.exp (100%) rename tests/functional2/lang/{sort => builtins.sort}/in.nix (100%) rename tests/functional2/lang/{regex-split => builtins.split}/eval-okay.out.exp (100%) rename tests/functional2/lang/{regex-split => builtins.split}/in.nix (100%) rename tests/functional2/lang/{splitversion => builtins.splitVersion}/eval-okay.out.exp (100%) rename tests/functional2/lang/{splitversion => builtins.splitVersion}/in.nix (100%) rename tests/functional2/lang/{substring => builtins.substring}/eval-fail.err.exp (100%) rename tests/functional2/lang/{substring => builtins.substring}/in.nix (100%) rename tests/functional2/lang/{to-path => builtins.toPath}/eval-fail.err.exp (100%) rename tests/functional2/lang/{to-path => builtins.toPath}/in.nix (100%) rename tests/functional2/lang/{toString => builtins.toString}/eval-fail.err.exp (100%) rename tests/functional2/lang/{toString => builtins.toString}/in.nix (100%) rename tests/functional2/lang/{tryeval => builtins.tryEval}/eval-okay.out.exp (100%) rename tests/functional2/lang/{tryeval => builtins.tryEval}/in.nix (100%) rename tests/functional2/lang/{zipAttrsWith => builtins.zipAttrsWith}/eval-okay.out.exp (100%) rename tests/functional2/lang/{zipAttrsWith => builtins.zipAttrsWith}/in.nix (100%) rename tests/functional2/lang/{inherits => inherit}/in.nix (100%) rename tests/functional2/lang/{inherits => inherit}/parse-okay.out.exp (100%) rename tests/functional2/lang/{json => parser-output-json}/in.nix (100%) rename tests/functional2/lang/{json => parser-output-json}/parse-okay.out.exp (100%) diff --git a/tests/functional2/lang/callable-attrs/eval-okay.out.exp b/tests/functional2/lang/__functor/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/callable-attrs/eval-okay.out.exp rename to tests/functional2/lang/__functor/eval-okay.out.exp diff --git a/tests/functional2/lang/callable-attrs/in.nix b/tests/functional2/lang/__functor/in.nix similarity index 100% rename from tests/functional2/lang/callable-attrs/in.nix rename to tests/functional2/lang/__functor/in.nix diff --git a/tests/functional2/lang/abort/eval-fail.err.exp b/tests/functional2/lang/builtins.abort/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/abort/eval-fail.err.exp rename to tests/functional2/lang/builtins.abort/eval-fail.err.exp diff --git a/tests/functional2/lang/abort/in.nix b/tests/functional2/lang/builtins.abort/in.nix similarity index 100% rename from tests/functional2/lang/abort/in.nix rename to tests/functional2/lang/builtins.abort/in.nix diff --git a/tests/functional2/lang/any-all/eval-okay.out.exp b/tests/functional2/lang/builtins.any-all/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/any-all/eval-okay.out.exp rename to tests/functional2/lang/builtins.any-all/eval-okay.out.exp diff --git a/tests/functional2/lang/any-all/in.nix b/tests/functional2/lang/builtins.any-all/in.nix similarity index 100% rename from tests/functional2/lang/any-all/in.nix rename to tests/functional2/lang/builtins.any-all/in.nix diff --git a/tests/functional2/lang/attrnames/eval-okay.out.exp b/tests/functional2/lang/builtins.attrNames-getAttr-attrValues/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/attrnames/eval-okay.out.exp rename to tests/functional2/lang/builtins.attrNames-getAttr-attrValues/eval-okay.out.exp diff --git a/tests/functional2/lang/attrnames/in.nix b/tests/functional2/lang/builtins.attrNames-getAttr-attrValues/in.nix similarity index 100% rename from tests/functional2/lang/attrnames/in.nix rename to tests/functional2/lang/builtins.attrNames-getAttr-attrValues/in.nix diff --git a/tests/functional2/lang/catattrs/eval-okay.out.exp b/tests/functional2/lang/builtins.catAttrs/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/catattrs/eval-okay.out.exp rename to tests/functional2/lang/builtins.catAttrs/eval-okay.out.exp diff --git a/tests/functional2/lang/catattrs/in.nix b/tests/functional2/lang/builtins.catAttrs/in.nix similarity index 100% rename from tests/functional2/lang/catattrs/in.nix rename to tests/functional2/lang/builtins.catAttrs/in.nix diff --git a/tests/functional2/lang/concatmap/eval-okay.out.exp b/tests/functional2/lang/builtins.concatMap/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/concatmap/eval-okay.out.exp rename to tests/functional2/lang/builtins.concatMap/eval-okay.out.exp diff --git a/tests/functional2/lang/concatmap/in.nix b/tests/functional2/lang/builtins.concatMap/in.nix similarity index 100% rename from tests/functional2/lang/concatmap/in.nix rename to tests/functional2/lang/builtins.concatMap/in.nix diff --git a/tests/functional2/lang/concatstringssep/eval-okay.out.exp b/tests/functional2/lang/builtins.concatStringsSep/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/concatstringssep/eval-okay.out.exp rename to tests/functional2/lang/builtins.concatStringsSep/eval-okay.out.exp diff --git a/tests/functional2/lang/concatstringssep/in.nix b/tests/functional2/lang/builtins.concatStringsSep/in.nix similarity index 100% rename from tests/functional2/lang/concatstringssep/in.nix rename to tests/functional2/lang/builtins.concatStringsSep/in.nix diff --git a/tests/functional2/lang/deepseq/eval-fail.err.exp b/tests/functional2/lang/builtins.deepSeq/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/deepseq/eval-fail.err.exp rename to tests/functional2/lang/builtins.deepSeq/eval-fail.err.exp diff --git a/tests/functional2/lang/deepseq/in.nix b/tests/functional2/lang/builtins.deepSeq/in.nix similarity index 100% rename from tests/functional2/lang/deepseq/in.nix rename to tests/functional2/lang/builtins.deepSeq/in.nix diff --git a/tests/functional2/lang/elem/eval-okay.out.exp b/tests/functional2/lang/builtins.elem/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/elem/eval-okay.out.exp rename to tests/functional2/lang/builtins.elem/eval-okay.out.exp diff --git a/tests/functional2/lang/elem/in.nix b/tests/functional2/lang/builtins.elem/in.nix similarity index 100% rename from tests/functional2/lang/elem/in.nix rename to tests/functional2/lang/builtins.elem/in.nix diff --git a/tests/functional2/lang/filter/eval-okay.out.exp b/tests/functional2/lang/builtins.filter/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/filter/eval-okay.out.exp rename to tests/functional2/lang/builtins.filter/eval-okay.out.exp diff --git a/tests/functional2/lang/filter/in.nix b/tests/functional2/lang/builtins.filter/in.nix similarity index 100% rename from tests/functional2/lang/filter/in.nix rename to tests/functional2/lang/builtins.filter/in.nix diff --git a/tests/functional2/lang/floor-ceil/eval-okay.out.exp b/tests/functional2/lang/builtins.floor-ceil/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/floor-ceil/eval-okay.out.exp rename to tests/functional2/lang/builtins.floor-ceil/eval-okay.out.exp diff --git a/tests/functional2/lang/floor-ceil/in.nix b/tests/functional2/lang/builtins.floor-ceil/in.nix similarity index 100% rename from tests/functional2/lang/floor-ceil/in.nix rename to tests/functional2/lang/builtins.floor-ceil/in.nix diff --git a/tests/functional2/lang/groupBy/eval-okay.out.exp b/tests/functional2/lang/builtins.groupBy/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/groupBy/eval-okay.out.exp rename to tests/functional2/lang/builtins.groupBy/eval-okay.out.exp diff --git a/tests/functional2/lang/groupBy/in.nix b/tests/functional2/lang/builtins.groupBy/in.nix similarity index 100% rename from tests/functional2/lang/groupBy/in.nix rename to tests/functional2/lang/builtins.groupBy/in.nix diff --git a/tests/functional2/lang/hashstring/eval-okay.out.exp b/tests/functional2/lang/builtins.hashString/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/hashstring/eval-okay.out.exp rename to tests/functional2/lang/builtins.hashString/eval-okay.out.exp diff --git a/tests/functional2/lang/hashstring/in.nix b/tests/functional2/lang/builtins.hashString/in.nix similarity index 100% rename from tests/functional2/lang/hashstring/in.nix rename to tests/functional2/lang/builtins.hashString/in.nix diff --git a/tests/functional2/lang/intersectAttrs/eval-okay.out.exp b/tests/functional2/lang/builtins.intersectAttrs/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/intersectAttrs/eval-okay.out.exp rename to tests/functional2/lang/builtins.intersectAttrs/eval-okay.out.exp diff --git a/tests/functional2/lang/intersectAttrs/in.nix b/tests/functional2/lang/builtins.intersectAttrs/in.nix similarity index 100% rename from tests/functional2/lang/intersectAttrs/in.nix rename to tests/functional2/lang/builtins.intersectAttrs/in.nix diff --git a/tests/functional2/lang/listtoattrs/eval-okay.out.exp b/tests/functional2/lang/builtins.listToAttrs/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/listtoattrs/eval-okay.out.exp rename to tests/functional2/lang/builtins.listToAttrs/eval-okay.out.exp diff --git a/tests/functional2/lang/listtoattrs/in.nix b/tests/functional2/lang/builtins.listToAttrs/in.nix similarity index 100% rename from tests/functional2/lang/listtoattrs/in.nix rename to tests/functional2/lang/builtins.listToAttrs/in.nix diff --git a/tests/functional2/lang/map/eval-okay.out.exp b/tests/functional2/lang/builtins.map/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/map/eval-okay.out.exp rename to tests/functional2/lang/builtins.map/eval-okay.out.exp diff --git a/tests/functional2/lang/map/in.nix b/tests/functional2/lang/builtins.map/in.nix similarity index 100% rename from tests/functional2/lang/map/in.nix rename to tests/functional2/lang/builtins.map/in.nix diff --git a/tests/functional2/lang/mapattrs/eval-okay.out.exp b/tests/functional2/lang/builtins.mapAttrs/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/mapattrs/eval-okay.out.exp rename to tests/functional2/lang/builtins.mapAttrs/eval-okay.out.exp diff --git a/tests/functional2/lang/mapattrs/in.nix b/tests/functional2/lang/builtins.mapAttrs/in.nix similarity index 100% rename from tests/functional2/lang/mapattrs/in.nix rename to tests/functional2/lang/builtins.mapAttrs/in.nix diff --git a/tests/functional2/lang/regex-match/eval-okay.out.exp b/tests/functional2/lang/builtins.matches/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/regex-match/eval-okay.out.exp rename to tests/functional2/lang/builtins.matches/eval-okay.out.exp diff --git a/tests/functional2/lang/regex-match/in.nix b/tests/functional2/lang/builtins.matches/in.nix similarity index 100% rename from tests/functional2/lang/regex-match/in.nix rename to tests/functional2/lang/builtins.matches/in.nix diff --git a/tests/functional2/lang/parse-flake-ref/eval-okay.out.exp b/tests/functional2/lang/builtins.parseFlakeRef/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/parse-flake-ref/eval-okay.out.exp rename to tests/functional2/lang/builtins.parseFlakeRef/eval-okay.out.exp diff --git a/tests/functional2/lang/parse-flake-ref/in.nix b/tests/functional2/lang/builtins.parseFlakeRef/in.nix similarity index 100% rename from tests/functional2/lang/parse-flake-ref/in.nix rename to tests/functional2/lang/builtins.parseFlakeRef/in.nix diff --git a/tests/functional2/lang/partition/eval-okay.out.exp b/tests/functional2/lang/builtins.partition/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/partition/eval-okay.out.exp rename to tests/functional2/lang/builtins.partition/eval-okay.out.exp diff --git a/tests/functional2/lang/partition/in.nix b/tests/functional2/lang/builtins.partition/in.nix similarity index 100% rename from tests/functional2/lang/partition/in.nix rename to tests/functional2/lang/builtins.partition/in.nix diff --git a/tests/functional2/lang/remove/eval-fail.err.exp b/tests/functional2/lang/builtins.removeAttrs/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/remove/eval-fail.err.exp rename to tests/functional2/lang/builtins.removeAttrs/eval-fail.err.exp diff --git a/tests/functional2/lang/remove/in.nix b/tests/functional2/lang/builtins.removeAttrs/in.nix similarity index 100% rename from tests/functional2/lang/remove/in.nix rename to tests/functional2/lang/builtins.removeAttrs/in.nix diff --git a/tests/functional2/lang/replacestrings/eval-okay.out.exp b/tests/functional2/lang/builtins.replaceStrings/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/replacestrings/eval-okay.out.exp rename to tests/functional2/lang/builtins.replaceStrings/eval-okay.out.exp diff --git a/tests/functional2/lang/replacestrings/in.nix b/tests/functional2/lang/builtins.replaceStrings/in.nix similarity index 100% rename from tests/functional2/lang/replacestrings/in.nix rename to tests/functional2/lang/builtins.replaceStrings/in.nix diff --git a/tests/functional2/lang/seq/eval-fail.err.exp b/tests/functional2/lang/builtins.seq/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/seq/eval-fail.err.exp rename to tests/functional2/lang/builtins.seq/eval-fail.err.exp diff --git a/tests/functional2/lang/seq/in.nix b/tests/functional2/lang/builtins.seq/in.nix similarity index 100% rename from tests/functional2/lang/seq/in.nix rename to tests/functional2/lang/builtins.seq/in.nix diff --git a/tests/functional2/lang/sort/eval-okay.out.exp b/tests/functional2/lang/builtins.sort/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/sort/eval-okay.out.exp rename to tests/functional2/lang/builtins.sort/eval-okay.out.exp diff --git a/tests/functional2/lang/sort/in.nix b/tests/functional2/lang/builtins.sort/in.nix similarity index 100% rename from tests/functional2/lang/sort/in.nix rename to tests/functional2/lang/builtins.sort/in.nix diff --git a/tests/functional2/lang/regex-split/eval-okay.out.exp b/tests/functional2/lang/builtins.split/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/regex-split/eval-okay.out.exp rename to tests/functional2/lang/builtins.split/eval-okay.out.exp diff --git a/tests/functional2/lang/regex-split/in.nix b/tests/functional2/lang/builtins.split/in.nix similarity index 100% rename from tests/functional2/lang/regex-split/in.nix rename to tests/functional2/lang/builtins.split/in.nix diff --git a/tests/functional2/lang/splitversion/eval-okay.out.exp b/tests/functional2/lang/builtins.splitVersion/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/splitversion/eval-okay.out.exp rename to tests/functional2/lang/builtins.splitVersion/eval-okay.out.exp diff --git a/tests/functional2/lang/splitversion/in.nix b/tests/functional2/lang/builtins.splitVersion/in.nix similarity index 100% rename from tests/functional2/lang/splitversion/in.nix rename to tests/functional2/lang/builtins.splitVersion/in.nix diff --git a/tests/functional2/lang/substring/eval-fail.err.exp b/tests/functional2/lang/builtins.substring/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/substring/eval-fail.err.exp rename to tests/functional2/lang/builtins.substring/eval-fail.err.exp diff --git a/tests/functional2/lang/substring/in.nix b/tests/functional2/lang/builtins.substring/in.nix similarity index 100% rename from tests/functional2/lang/substring/in.nix rename to tests/functional2/lang/builtins.substring/in.nix diff --git a/tests/functional2/lang/to-path/eval-fail.err.exp b/tests/functional2/lang/builtins.toPath/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/to-path/eval-fail.err.exp rename to tests/functional2/lang/builtins.toPath/eval-fail.err.exp diff --git a/tests/functional2/lang/to-path/in.nix b/tests/functional2/lang/builtins.toPath/in.nix similarity index 100% rename from tests/functional2/lang/to-path/in.nix rename to tests/functional2/lang/builtins.toPath/in.nix diff --git a/tests/functional2/lang/toString/eval-fail.err.exp b/tests/functional2/lang/builtins.toString/eval-fail.err.exp similarity index 100% rename from tests/functional2/lang/toString/eval-fail.err.exp rename to tests/functional2/lang/builtins.toString/eval-fail.err.exp diff --git a/tests/functional2/lang/toString/in.nix b/tests/functional2/lang/builtins.toString/in.nix similarity index 100% rename from tests/functional2/lang/toString/in.nix rename to tests/functional2/lang/builtins.toString/in.nix diff --git a/tests/functional2/lang/tryeval/eval-okay.out.exp b/tests/functional2/lang/builtins.tryEval/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/tryeval/eval-okay.out.exp rename to tests/functional2/lang/builtins.tryEval/eval-okay.out.exp diff --git a/tests/functional2/lang/tryeval/in.nix b/tests/functional2/lang/builtins.tryEval/in.nix similarity index 100% rename from tests/functional2/lang/tryeval/in.nix rename to tests/functional2/lang/builtins.tryEval/in.nix diff --git a/tests/functional2/lang/zipAttrsWith/eval-okay.out.exp b/tests/functional2/lang/builtins.zipAttrsWith/eval-okay.out.exp similarity index 100% rename from tests/functional2/lang/zipAttrsWith/eval-okay.out.exp rename to tests/functional2/lang/builtins.zipAttrsWith/eval-okay.out.exp diff --git a/tests/functional2/lang/zipAttrsWith/in.nix b/tests/functional2/lang/builtins.zipAttrsWith/in.nix similarity index 100% rename from tests/functional2/lang/zipAttrsWith/in.nix rename to tests/functional2/lang/builtins.zipAttrsWith/in.nix diff --git a/tests/functional2/lang/inherits/in.nix b/tests/functional2/lang/inherit/in.nix similarity index 100% rename from tests/functional2/lang/inherits/in.nix rename to tests/functional2/lang/inherit/in.nix diff --git a/tests/functional2/lang/inherits/parse-okay.out.exp b/tests/functional2/lang/inherit/parse-okay.out.exp similarity index 100% rename from tests/functional2/lang/inherits/parse-okay.out.exp rename to tests/functional2/lang/inherit/parse-okay.out.exp diff --git a/tests/functional2/lang/json/in.nix b/tests/functional2/lang/parser-output-json/in.nix similarity index 100% rename from tests/functional2/lang/json/in.nix rename to tests/functional2/lang/parser-output-json/in.nix diff --git a/tests/functional2/lang/json/parse-okay.out.exp b/tests/functional2/lang/parser-output-json/parse-okay.out.exp similarity index 100% rename from tests/functional2/lang/json/parse-okay.out.exp rename to tests/functional2/lang/parser-output-json/parse-okay.out.exp