Make tests/dyn-drv test dir

.gitignore

@@ -85,6 +85,7 @@ perl/Makefile.config
 /tests/shell.drv
 /tests/config.nix
 /tests/ca/config.nix
+/tests/dyn-drv/config.nix
 /tests/repl-result-out
 
 # /tests/lang/

tests/dyn-drv/common.sh

@@ -0,0 +1,8 @@
+source ../common.sh
+
+# Need backend to support text-hashing too
+requireDaemonNewerThan "2.16.0pre20230419"
+
+enableFeatures "ca-derivations dynamic-derivations"
+
+restartDaemon

tests/dyn-drv/config.nix.in

@@ -0,0 +1 @@
+../config.nix.in

tests/ca/text-hashed-output.sh → tests/dyn-drv/text-hashed-output.sh

@@ -2,14 +2,6 @@
 
 source common.sh
 
-# Need backend to support text-hashing too
-requireDaemonNewerThan "2.16.0pre20230419"
-
-# Globally enable dynamic-derivations in addition to CA derivations
-enableFeatures "dynamic-derivations"
-
-restartDaemon
-
 # In the corresponding nix file, we have two derivations: the first, named root,
 # is a normal recursive derivation, while the second, named dependent, has the
 # new outputHashMode "text". Note that in "dependent", we don't refer to the

tests/local.mk

@@ -110,7 +110,7 @@ nix_tests = \
  ca/derivation-json.sh \
  import-derivation.sh \
  ca/import-derivation.sh \
- ca/text-hashed-output.sh \
+ dyn-drv/text-hashed-output.sh \
  nix_path.sh \
  case-hack.sh \
  placeholders.sh \
@@ -138,11 +138,18 @@ ifeq ($(HAVE_LIBCPUID), 1)
  nix_tests += compute-levels.sh
 endif
 
-install-tests += $(foreach x, $(nix_tests), tests/$(x))
+install-tests += $(foreach x, $(nix_tests), $(d)/$(x))
 
-clean-files += $(d)/common/vars-and-functions.sh $(d)/config.nix $(d)/ca/config.nix
+clean-files += \
+ $(d)/common/vars-and-functions.sh \
+ $(d)/config.nix \
+ $(d)/ca/config.nix \
+ $(d)/dyn-drv/config.nix
 
-test-deps += tests/common/vars-and-functions.sh tests/config.nix tests/ca/config.nix
+test-deps += \
+ tests/common/vars-and-functions.sh \
+ tests/config.nix \
+ tests/dyn-drv/config.nix \
 
 ifeq ($(BUILD_SHARED_LIBS), 1)
  test-deps += tests/plugins/libplugintest.$(SO_EXT)