Put back files for now

We'll revert this sometime later
NixOS · Jul 2, 2024 · 451f8a8 · 451f8a8
1 parent 1194681
commit 451f8a8
Show file tree

Hide file tree

Showing 237 changed files with 129 additions and 121 deletions.
diff --git a/.gitignore b/.gitignore
@@ -49,22 +49,22 @@ perl/Makefile.config
 /src/libexpr/parser-tab.output
 /src/libexpr/nix.tbl
 /src/libexpr/tests
-/src/nix-expr-tests/libnixexpr-tests
+/tests/unit/libexpr/libnixexpr-tests
 
 # /src/libfetchers
-/src/nix-fetchers-tests/libnixfetchers-tests
+/tests/unit/libfetchers/libnixfetchers-tests
 
 # /src/libflake
-/src/nix-flake-tests/libnixflake-tests
+/tests/unit/libflake/libnixflake-tests
 
 # /src/libstore/
 *.gen.*
 /src/libstore/tests
-/src/nix-store-tests/libnixstore-tests
+/tests/unit/libstore/libnixstore-tests
 
 # /src/libutil/
 /src/libutil/tests
-/src/nix-util-tests/libnixutil-tests
+/tests/unit/libutil/libnixutil-tests
 
 /src/nix/nix
 

diff --git a/maintainers/flake-module.nix b/maintainers/flake-module.nix
@@ -15,7 +15,7 @@
           excludes = [
             # We don't want to format test data
             # ''tests/(?!nixos/).*\.nix''
-            ''^src/[^/]*-tests/data/.*$''
+            ''^tests/unit/[^/]*/data/.*$''
 
             # Don't format vendored code
             ''^doc/manual/redirects\.js$''
@@ -429,65 +429,65 @@
             ''^tests/nixos/ca-fd-leak/sender\.c''
             ''^tests/nixos/ca-fd-leak/smuggler\.c''
             ''^tests/nixos/user-sandboxing/attacker\.c''
-            ''^src/nix-expr-test-support/tests/libexpr\.hh''
-            ''^src/nix-expr-test-support/tests/value/context\.cc''
-            ''^src/nix-expr-test-support/tests/value/context\.hh''
-            ''^src/nix-expr-tests/derived-path\.cc''
-            ''^src/nix-expr-tests/error_traces\.cc''
-            ''^src/nix-expr-tests/eval\.cc''
-            ''^src/nix-expr-tests/json\.cc''
-            ''^src/nix-expr-tests/main\.cc''
-            ''^src/nix-expr-tests/primops\.cc''
-            ''^src/nix-expr-tests/search-path\.cc''
-            ''^src/nix-expr-tests/trivial\.cc''
-            ''^src/nix-expr-tests/value/context\.cc''
-            ''^src/nix-expr-tests/value/print\.cc''
-            ''^src/nix-fetchers-tests/public-key\.cc''
-            ''^src/nix-flake-tests/flakeref\.cc''
-            ''^src/nix-flake-tests/url-name\.cc''
-            ''^src/nix-store-test-support/tests/derived-path\.cc''
-            ''^src/nix-store-test-support/tests/derived-path\.hh''
-            ''^src/nix-store-test-support/tests/nix_api_store\.hh''
-            ''^src/nix-store-test-support/tests/outputs-spec\.cc''
-            ''^src/nix-store-test-support/tests/outputs-spec\.hh''
-            ''^src/nix-store-test-support/tests/path\.cc''
-            ''^src/nix-store-test-support/tests/path\.hh''
-            ''^src/nix-store-test-support/tests/protocol\.hh''
-            ''^src/nix-store-tests/common-protocol\.cc''
-            ''^src/nix-store-tests/content-address\.cc''
-            ''^src/nix-store-tests/derivation\.cc''
-            ''^src/nix-store-tests/derived-path\.cc''
-            ''^src/nix-store-tests/downstream-placeholder\.cc''
-            ''^src/nix-store-tests/machines\.cc''
-            ''^src/nix-store-tests/nar-info-disk-cache\.cc''
-            ''^src/nix-store-tests/nar-info\.cc''
-            ''^src/nix-store-tests/outputs-spec\.cc''
-            ''^src/nix-store-tests/path-info\.cc''
-            ''^src/nix-store-tests/path\.cc''
-            ''^src/nix-store-tests/serve-protocol\.cc''
-            ''^src/nix-store-tests/worker-protocol\.cc''
-            ''^src/nix-util-test-support/tests/characterization\.hh''
-            ''^src/nix-util-test-support/tests/hash\.cc''
-            ''^src/nix-util-test-support/tests/hash\.hh''
-            ''^src/nix-util-tests/args\.cc''
-            ''^src/nix-util-tests/canon-path\.cc''
-            ''^src/nix-util-tests/chunked-vector\.cc''
-            ''^src/nix-util-tests/closure\.cc''
-            ''^src/nix-util-tests/compression\.cc''
-            ''^src/nix-util-tests/config\.cc''
-            ''^src/nix-util-tests/file-content-address\.cc''
-            ''^src/nix-util-tests/git\.cc''
-            ''^src/nix-util-tests/hash\.cc''
-            ''^src/nix-util-tests/hilite\.cc''
-            ''^src/nix-util-tests/json-utils\.cc''
-            ''^src/nix-util-tests/logging\.cc''
-            ''^src/nix-util-tests/lru-cache\.cc''
-            ''^src/nix-util-tests/pool\.cc''
-            ''^src/nix-util-tests/references\.cc''
-            ''^src/nix-util-tests/suggestions\.cc''
-            ''^src/nix-util-tests/tests\.cc''
-            ''^src/nix-util-tests/url\.cc''
-            ''^src/nix-util-tests/xml-writer\.cc''
+            ''^tests/unit/libexpr-support/tests/libexpr\.hh''
+            ''^tests/unit/libexpr-support/tests/value/context\.cc''
+            ''^tests/unit/libexpr-support/tests/value/context\.hh''
+            ''^tests/unit/libexpr/derived-path\.cc''
+            ''^tests/unit/libexpr/error_traces\.cc''
+            ''^tests/unit/libexpr/eval\.cc''
+            ''^tests/unit/libexpr/json\.cc''
+            ''^tests/unit/libexpr/main\.cc''
+            ''^tests/unit/libexpr/primops\.cc''
+            ''^tests/unit/libexpr/search-path\.cc''
+            ''^tests/unit/libexpr/trivial\.cc''
+            ''^tests/unit/libexpr/value/context\.cc''
+            ''^tests/unit/libexpr/value/print\.cc''
+            ''^tests/unit/libfetchers/public-key\.cc''
+            ''^tests/unit/libflake/flakeref\.cc''
+            ''^tests/unit/libflake/url-name\.cc''
+            ''^tests/unit/libstore-support/tests/derived-path\.cc''
+            ''^tests/unit/libstore-support/tests/derived-path\.hh''
+            ''^tests/unit/libstore-support/tests/nix_api_store\.hh''
+            ''^tests/unit/libstore-support/tests/outputs-spec\.cc''
+            ''^tests/unit/libstore-support/tests/outputs-spec\.hh''
+            ''^tests/unit/libstore-support/tests/path\.cc''
+            ''^tests/unit/libstore-support/tests/path\.hh''
+            ''^tests/unit/libstore-support/tests/protocol\.hh''
+            ''^tests/unit/libstore/common-protocol\.cc''
+            ''^tests/unit/libstore/content-address\.cc''
+            ''^tests/unit/libstore/derivation\.cc''
+            ''^tests/unit/libstore/derived-path\.cc''
+            ''^tests/unit/libstore/downstream-placeholder\.cc''
+            ''^tests/unit/libstore/machines\.cc''
+            ''^tests/unit/libstore/nar-info-disk-cache\.cc''
+            ''^tests/unit/libstore/nar-info\.cc''
+            ''^tests/unit/libstore/outputs-spec\.cc''
+            ''^tests/unit/libstore/path-info\.cc''
+            ''^tests/unit/libstore/path\.cc''
+            ''^tests/unit/libstore/serve-protocol\.cc''
+            ''^tests/unit/libstore/worker-protocol\.cc''
+            ''^tests/unit/libutil-support/tests/characterization\.hh''
+            ''^tests/unit/libutil-support/tests/hash\.cc''
+            ''^tests/unit/libutil-support/tests/hash\.hh''
+            ''^tests/unit/libutil/args\.cc''
+            ''^tests/unit/libutil/canon-path\.cc''
+            ''^tests/unit/libutil/chunked-vector\.cc''
+            ''^tests/unit/libutil/closure\.cc''
+            ''^tests/unit/libutil/compression\.cc''
+            ''^tests/unit/libutil/config\.cc''
+            ''^tests/unit/libutil/file-content-address\.cc''
+            ''^tests/unit/libutil/git\.cc''
+            ''^tests/unit/libutil/hash\.cc''
+            ''^tests/unit/libutil/hilite\.cc''
+            ''^tests/unit/libutil/json-utils\.cc''
+            ''^tests/unit/libutil/logging\.cc''
+            ''^tests/unit/libutil/lru-cache\.cc''
+            ''^tests/unit/libutil/pool\.cc''
+            ''^tests/unit/libutil/references\.cc''
+            ''^tests/unit/libutil/suggestions\.cc''
+            ''^tests/unit/libutil/tests\.cc''
+            ''^tests/unit/libutil/url\.cc''
+            ''^tests/unit/libutil/xml-writer\.cc''
           ];
         };
         shellcheck = {
@@ -666,7 +666,7 @@
             ''^tests/functional/user-envs\.sh$''
             ''^tests/functional/why-depends\.sh$''
             ''^tests/functional/zstd\.sh$''
-            ''^src/nix-util-tests/data/git/check-data\.sh$''
+            ''^tests/unit/libutil/data/git/check-data\.sh$''
           ];
         };
         # TODO: nixfmt, https://github.com/NixOS/nixfmt/issues/153

diff --git a/packaging/components.nix b/packaging/components.nix
@@ -9,24 +9,24 @@ in
 
   nix-util = callPackage ../src/libutil/package.nix { };
   nix-util-c = callPackage ../src/libutil-c/package.nix { };
-  nix-util-test-support = callPackage ../src/nix-util-test-support/package.nix { };
-  nix-util-tests = callPackage ../src/nix-util-tests/package.nix { };
+  nix-util-test-support = callPackage ../tests/unit/libutil-support/package.nix { };
+  nix-util-tests = callPackage ../tests/unit/libutil/package.nix { };
 
   nix-store = callPackage ../src/libstore/package.nix { };
   nix-store-c = callPackage ../src/libstore-c/package.nix { };
-  nix-store-test-support = callPackage ../src/nix-store-test-support/package.nix { };
-  nix-store-tests = callPackage ../src/nix-store-tests/package.nix { };
+  nix-store-test-support = callPackage ../tests/unit/libstore-support/package.nix { };
+  nix-store-tests = callPackage ../tests/unit/libstore/package.nix { };
 
   nix-fetchers = callPackage ../src/libfetchers/package.nix { };
-  nix-fetchers-tests = callPackage ../src/nix-fetchers-tests/package.nix { };
+  nix-fetchers-tests = callPackage ../tests/unit/libfetchers/package.nix { };
 
   nix-expr = callPackage ../src/libexpr/package.nix { };
   nix-expr-c = callPackage ../src/libexpr-c/package.nix { };
-  nix-expr-test-support = callPackage ../src/nix-expr-test-support/package.nix { };
-  nix-expr-tests = callPackage ../src/nix-expr-tests/package.nix { };
+  nix-expr-test-support = callPackage ../tests/unit/libexpr-support/package.nix { };
+  nix-expr-tests = callPackage ../tests/unit/libexpr/package.nix { };
 
   nix-flake = callPackage ../src/libflake/package.nix { };
-  nix-flake-tests = callPackage ../src/nix-flake-tests/package.nix { };
+  nix-flake-tests = callPackage ../tests/unit/libflake/package.nix { };
 
   nix-internal-api-docs = callPackage ../src/internal-api-docs/package.nix { };
   nix-external-api-docs = callPackage ../src/external-api-docs/package.nix { };

diff --git a/src/nix-expr-test-support b/src/nix-expr-test-support
@@ -0,0 +1 @@
+../tests/unit/libexpr-support
diff --git a/src/nix-expr-test-support/.version b/src/nix-expr-test-support/.version
diff --git a/src/nix-expr-test-support/build-utils-meson b/src/nix-expr-test-support/build-utils-meson
diff --git a/src/nix-expr-tests b/src/nix-expr-tests
@@ -0,0 +1 @@
+../tests/unit/libexpr
diff --git a/src/nix-expr-tests/.version b/src/nix-expr-tests/.version
diff --git a/src/nix-expr-tests/build-utils-meson b/src/nix-expr-tests/build-utils-meson
diff --git a/src/nix-fetchers-tests b/src/nix-fetchers-tests
@@ -0,0 +1 @@
+../tests/unit/libfetchers
diff --git a/src/nix-fetchers-tests/.version b/src/nix-fetchers-tests/.version
diff --git a/src/nix-fetchers-tests/build-utils-meson b/src/nix-fetchers-tests/build-utils-meson
diff --git a/src/nix-flake-tests b/src/nix-flake-tests
@@ -0,0 +1 @@
+../tests/unit/libflake
diff --git a/src/nix-flake-tests/.version b/src/nix-flake-tests/.version
diff --git a/src/nix-flake-tests/build-utils-meson b/src/nix-flake-tests/build-utils-meson
diff --git a/src/nix-store-test-support b/src/nix-store-test-support
@@ -0,0 +1 @@
+../tests/unit/libstore-support
diff --git a/src/nix-store-test-support/.version b/src/nix-store-test-support/.version
diff --git a/src/nix-store-test-support/build-utils-meson b/src/nix-store-test-support/build-utils-meson
diff --git a/src/nix-store-tests b/src/nix-store-tests
@@ -0,0 +1 @@
+../tests/unit/libstore
diff --git a/src/nix-store-tests/.version b/src/nix-store-tests/.version
diff --git a/src/nix-store-tests/build-utils-meson b/src/nix-store-tests/build-utils-meson
diff --git a/src/nix-store-tests/data/derivation/advanced-attributes-defaults.drv b/src/nix-store-tests/data/derivation/advanced-attributes-defaults.drv
diff --git a/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv b/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs-defaults.drv
diff --git a/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs.drv b/src/nix-store-tests/data/derivation/advanced-attributes-structured-attrs.drv
diff --git a/src/nix-store-tests/data/derivation/advanced-attributes.drv b/src/nix-store-tests/data/derivation/advanced-attributes.drv
diff --git a/src/nix-util-test-support b/src/nix-util-test-support
@@ -0,0 +1 @@
+../tests/unit/libutil-support
diff --git a/src/nix-util-test-support/.version b/src/nix-util-test-support/.version
diff --git a/src/nix-util-test-support/build-utils-meson b/src/nix-util-test-support/build-utils-meson
diff --git a/src/nix-util-tests b/src/nix-util-tests
@@ -0,0 +1 @@
+../tests/unit/libutil
diff --git a/src/nix-util-tests/.version b/src/nix-util-tests/.version
diff --git a/src/nix-util-tests/build-utils-meson b/src/nix-util-tests/build-utils-meson
diff --git a/tests/unit/libexpr-support/.version b/tests/unit/libexpr-support/.version
@@ -0,0 +1 @@
+../../../.version
diff --git a/tests/unit/libexpr-support/build-utils-meson b/tests/unit/libexpr-support/build-utils-meson
@@ -0,0 +1 @@
+../../../build-utils-meson/
diff --git a/src/nix-expr-test-support/meson.build → tests/unit/libexpr-support/meson.build b/src/nix-expr-test-support/meson.build → tests/unit/libexpr-support/meson.build
diff --git a/src/nix-expr-test-support/package.nix → tests/unit/libexpr-support/package.nix b/src/nix-expr-test-support/package.nix → tests/unit/libexpr-support/package.nix
@@ -29,9 +29,9 @@ mkMesonDerivation (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../build-utils-meson
+    ../../../build-utils-meson
     ./build-utils-meson
-    ../../.version
+    ../../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -58,7 +58,7 @@ mkMesonDerivation (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../.version
+      echo ${version} > ../../../.version
     '';
 
   mesonFlags = [

diff --git a/src/nix-expr-test-support/tests/libexpr.hh → tests/unit/libexpr-support/tests/libexpr.hh b/src/nix-expr-test-support/tests/libexpr.hh → tests/unit/libexpr-support/tests/libexpr.hh
diff --git a/...x-expr-test-support/tests/nix_api_expr.hh → ...nit/libexpr-support/tests/nix_api_expr.hh b/...x-expr-test-support/tests/nix_api_expr.hh → ...nit/libexpr-support/tests/nix_api_expr.hh
diff --git a/...-expr-test-support/tests/value/context.cc → ...it/libexpr-support/tests/value/context.cc b/...-expr-test-support/tests/value/context.cc → ...it/libexpr-support/tests/value/context.cc
diff --git a/...-expr-test-support/tests/value/context.hh → ...it/libexpr-support/tests/value/context.hh b/...-expr-test-support/tests/value/context.hh → ...it/libexpr-support/tests/value/context.hh
diff --git a/tests/unit/libexpr/.version b/tests/unit/libexpr/.version
@@ -0,0 +1 @@
+../../../.version
diff --git a/tests/unit/libexpr/build-utils-meson b/tests/unit/libexpr/build-utils-meson
@@ -0,0 +1 @@
+../../../build-utils-meson/
diff --git a/src/nix-expr-tests/data/.gitkeep → tests/unit/libexpr/data/.gitkeep b/src/nix-expr-tests/data/.gitkeep → tests/unit/libexpr/data/.gitkeep
diff --git a/src/nix-expr-tests/derived-path.cc → tests/unit/libexpr/derived-path.cc b/src/nix-expr-tests/derived-path.cc → tests/unit/libexpr/derived-path.cc
diff --git a/src/nix-expr-tests/error_traces.cc → tests/unit/libexpr/error_traces.cc b/src/nix-expr-tests/error_traces.cc → tests/unit/libexpr/error_traces.cc
diff --git a/src/nix-expr-tests/eval.cc → tests/unit/libexpr/eval.cc b/src/nix-expr-tests/eval.cc → tests/unit/libexpr/eval.cc
diff --git a/src/nix-expr-tests/json.cc → tests/unit/libexpr/json.cc b/src/nix-expr-tests/json.cc → tests/unit/libexpr/json.cc
diff --git a/src/nix-expr-tests/main.cc → tests/unit/libexpr/main.cc b/src/nix-expr-tests/main.cc → tests/unit/libexpr/main.cc
diff --git a/src/nix-expr-tests/meson.build → tests/unit/libexpr/meson.build b/src/nix-expr-tests/meson.build → tests/unit/libexpr/meson.build
diff --git a/src/nix-expr-tests/nix_api_expr.cc → tests/unit/libexpr/nix_api_expr.cc b/src/nix-expr-tests/nix_api_expr.cc → tests/unit/libexpr/nix_api_expr.cc
diff --git a/src/nix-expr-tests/nix_api_external.cc → tests/unit/libexpr/nix_api_external.cc b/src/nix-expr-tests/nix_api_external.cc → tests/unit/libexpr/nix_api_external.cc
diff --git a/src/nix-expr-tests/nix_api_value.cc → tests/unit/libexpr/nix_api_value.cc b/src/nix-expr-tests/nix_api_value.cc → tests/unit/libexpr/nix_api_value.cc
diff --git a/src/nix-expr-tests/package.nix → tests/unit/libexpr/package.nix b/src/nix-expr-tests/package.nix → tests/unit/libexpr/package.nix
@@ -32,9 +32,9 @@ mkMesonDerivation (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../build-utils-meson
+    ../../../build-utils-meson
     ./build-utils-meson
-    ../../.version
+    ../../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -63,7 +63,7 @@ mkMesonDerivation (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../.version
+      echo ${version} > ../../../.version
     '';
 
   mesonFlags = [

diff --git a/src/nix-expr-tests/primops.cc → tests/unit/libexpr/primops.cc b/src/nix-expr-tests/primops.cc → tests/unit/libexpr/primops.cc
diff --git a/src/nix-expr-tests/search-path.cc → tests/unit/libexpr/search-path.cc b/src/nix-expr-tests/search-path.cc → tests/unit/libexpr/search-path.cc
diff --git a/src/nix-expr-tests/trivial.cc → tests/unit/libexpr/trivial.cc b/src/nix-expr-tests/trivial.cc → tests/unit/libexpr/trivial.cc
diff --git a/src/nix-expr-tests/value/context.cc → tests/unit/libexpr/value/context.cc b/src/nix-expr-tests/value/context.cc → tests/unit/libexpr/value/context.cc
diff --git a/src/nix-expr-tests/value/print.cc → tests/unit/libexpr/value/print.cc b/src/nix-expr-tests/value/print.cc → tests/unit/libexpr/value/print.cc
diff --git a/src/nix-expr-tests/value/value.cc → tests/unit/libexpr/value/value.cc b/src/nix-expr-tests/value/value.cc → tests/unit/libexpr/value/value.cc
diff --git a/tests/unit/libfetchers/.version b/tests/unit/libfetchers/.version
@@ -0,0 +1 @@
+../../../.version
diff --git a/tests/unit/libfetchers/build-utils-meson b/tests/unit/libfetchers/build-utils-meson
@@ -0,0 +1 @@
+../../../build-utils-meson/
diff --git a/...rs-tests/data/public-key/defaultType.json → ...fetchers/data/public-key/defaultType.json b/...rs-tests/data/public-key/defaultType.json → ...fetchers/data/public-key/defaultType.json
diff --git a/...rs-tests/data/public-key/noRoundTrip.json → ...fetchers/data/public-key/noRoundTrip.json b/...rs-tests/data/public-key/noRoundTrip.json → ...fetchers/data/public-key/noRoundTrip.json
diff --git a/...etchers-tests/data/public-key/simple.json → ...t/libfetchers/data/public-key/simple.json b/...etchers-tests/data/public-key/simple.json → ...t/libfetchers/data/public-key/simple.json
diff --git a/src/nix-fetchers-tests/meson.build → tests/unit/libfetchers/meson.build b/src/nix-fetchers-tests/meson.build → tests/unit/libfetchers/meson.build
diff --git a/src/nix-fetchers-tests/package.nix → tests/unit/libfetchers/package.nix b/src/nix-fetchers-tests/package.nix → tests/unit/libfetchers/package.nix
@@ -31,9 +31,9 @@ mkMesonDerivation (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../build-utils-meson
+    ../../../build-utils-meson
     ./build-utils-meson
-    ../../.version
+    ../../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -61,7 +61,7 @@ mkMesonDerivation (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../.version
+      echo ${version} > ../../../.version
     '';
 
   mesonFlags = [

diff --git a/src/nix-fetchers-tests/public-key.cc → tests/unit/libfetchers/public-key.cc b/src/nix-fetchers-tests/public-key.cc → tests/unit/libfetchers/public-key.cc
diff --git a/tests/unit/libflake/.version b/tests/unit/libflake/.version
@@ -0,0 +1 @@
+../../../.version
diff --git a/tests/unit/libflake/build-utils-meson b/tests/unit/libflake/build-utils-meson
@@ -0,0 +1 @@
+../../../build-utils-meson/
diff --git a/src/nix-flake-tests/data/.gitkeep → tests/unit/libflake/data/.gitkeep b/src/nix-flake-tests/data/.gitkeep → tests/unit/libflake/data/.gitkeep
diff --git a/src/nix-flake-tests/flakeref.cc → tests/unit/libflake/flakeref.cc b/src/nix-flake-tests/flakeref.cc → tests/unit/libflake/flakeref.cc
diff --git a/src/nix-flake-tests/meson.build → tests/unit/libflake/meson.build b/src/nix-flake-tests/meson.build → tests/unit/libflake/meson.build
diff --git a/src/nix-flake-tests/package.nix → tests/unit/libflake/package.nix b/src/nix-flake-tests/package.nix → tests/unit/libflake/package.nix
@@ -31,9 +31,9 @@ mkMesonDerivation (finalAttrs: {
 
   workDir = ./.;
   fileset = fileset.unions [
-    ../../build-utils-meson
+    ../../../build-utils-meson
     ./build-utils-meson
-    ../../.version
+    ../../../.version
     ./.version
     ./meson.build
     # ./meson.options
@@ -61,7 +61,7 @@ mkMesonDerivation (finalAttrs: {
     # Do the meson utils, without modification.
     ''
       chmod u+w ./.version
-      echo ${version} > ../../.version
+      echo ${version} > ../../../.version
     '';
 
   mesonFlags = [

diff --git a/src/nix-flake-tests/url-name.cc → tests/unit/libflake/url-name.cc b/src/nix-flake-tests/url-name.cc → tests/unit/libflake/url-name.cc
diff --git a/tests/unit/libstore-support/.version b/tests/unit/libstore-support/.version
@@ -0,0 +1 @@
+../../../.version