Move around unit test dirs to match new names

src/internal-api-docs/doxygen.cfg.in

@@ -41,21 +41,21 @@ INPUT                  = \
   @src@/libcmd \
   @src@/libexpr \
   @src@/libexpr/flake \
-  @src@/libexpr-test \
-  @src@/libexpr-test/value \
-  @src@/libexpr-test-support/test \
-  @src@/libexpr-test-support/test/value \
+  @src@/nix-expr-tests \
+  @src@/nix-expr-tests/value \
+  @src@/nix-expr-test-support/test \
+  @src@/nix-expr-test-support/test/value \
   @src@/libexpr/value \
   @src@/libfetchers \
   @src@/libmain \
   @src@/libstore \
   @src@/libstore/build \
   @src@/libstore/builtins \
-  @src@/libstore-test \
-  @src@/libstore-test-support/test \
+  @src@/nix-store-tests \
+  @src@/nix-store-test-support/test \
   @src@/libutil \
-  @src@/libutil-test \
-  @src@/libutil-test-support/test \
+  @src@/nix-util-tests \
+  @src@/nix-util-test-support/test \
   @src@/nix \
   @src@/nix-env \
   @src@/nix-store

src/nix-expr-tests/meson.build

@@ -1,4 +1,4 @@
-project('nix-expr-test', 'cpp',
+project('nix-expr-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',

src/nix-expr-tests/package.nix

@@ -39,7 +39,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-expr-test";
+  pname = "nix-expr-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -98,7 +98,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-expr-test
+        nix-expr-tests
         touch $out
       '';
     };

src/nix-fetchers-tests/meson.build

@@ -1,4 +1,4 @@
-project('nix-fetchers-test', 'cpp',
+project('nix-fetchers-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',

src/nix-fetchers-tests/package.nix

@@ -38,7 +38,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-fetchers-test";
+  pname = "nix-fetchers-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -96,7 +96,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-fetchers-test
+        nix-fetchers-tests
         touch $out
       '';
     };

src/nix-flake-tests/meson.build

@@ -1,4 +1,4 @@
-project('nix-flake-test', 'cpp',
+project('nix-flake-tests', 'cpp',
   version : files('.version'),
   default_options : [
     'cpp_std=c++2a',

src/nix-flake-tests/package.nix

@@ -38,7 +38,7 @@ let
 in
 
 mkDerivation (finalAttrs: {
-  pname = "nix-flake-test";
+  pname = "nix-flake-tests";
   inherit version;
 
   src = fileset.toSource {
@@ -96,7 +96,7 @@ mkDerivation (finalAttrs: {
       } ''
         PATH="${lib.makeBinPath [ finalAttrs.finalPackage ]}:$PATH"
         export _NIX_TEST_UNIT_DATA=${./data}
-        nix-flake-test
+        nix-flake-tests
         touch $out
       '';
     };