Make tests/dyn-drv test dir

This commit is contained in:
John Ericson 2023-04-19 18:49:50 -04:00
parent 61d3e64fd0
commit f3a31b14db
6 changed files with 21 additions and 12 deletions

1
.gitignore vendored
View file

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

8
tests/dyn-drv/common.sh Normal file
View file

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

1
tests/dyn-drv/config.nix.in Symbolic link
View file

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

View file

@ -2,14 +2,6 @@
source common.sh 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, # 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 # 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 # new outputHashMode "text". Note that in "dependent", we don't refer to the

View file

@ -110,7 +110,7 @@ nix_tests = \
ca/derivation-json.sh \ ca/derivation-json.sh \
import-derivation.sh \ import-derivation.sh \
ca/import-derivation.sh \ ca/import-derivation.sh \
ca/text-hashed-output.sh \ dyn-drv/text-hashed-output.sh \
nix_path.sh \ nix_path.sh \
case-hack.sh \ case-hack.sh \
placeholders.sh \ placeholders.sh \
@ -138,11 +138,18 @@ ifeq ($(HAVE_LIBCPUID), 1)
nix_tests += compute-levels.sh nix_tests += compute-levels.sh
endif 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) ifeq ($(BUILD_SHARED_LIBS), 1)
test-deps += tests/plugins/libplugintest.$(SO_EXT) test-deps += tests/plugins/libplugintest.$(SO_EXT)