57 files changed, 4 insertions, 2 deletions

diff --git a/mk/programs.mk b/mk/programs.mk
index a88d9d949..7768ef3eb 100644
--- a/mk/programs.mk
+++ b/mk/programs.mk
@@ -6,6 +6,9 @@ programs-list :=
 # - $(1)_NAME: the name of the program (e.g. ‘foo’); defaults to
 #   $(1).
 #
+# - $(1)_ENV: environment variables to set when running the program
+#   from the Makefile using the $(1)_RUN target.
+#
 # - $(1)_DIR: the directory where the (non-installed) program will be
 #   placed.
 #
@@ -87,6 +90,6 @@ define build-program
   # Phony target to run this program (typically as a dependency of 'check').
   .PHONY: $(1)_RUN
   $(1)_RUN: $$($(1)_PATH)
-	$(trace-test) $$(UNIT_TEST_ENV) $$($(1)_PATH)
+	$(trace-test) $$($(1)_ENV) $$($(1)_PATH)
 
 endef
diff --git a/package.nix b/package.nix
index 06d644627..482861379 100644
--- a/package.nix
+++ b/package.nix
@@ -106,7 +106,6 @@ in stdenv.mkDerivation (finalAttrs: {
       configureFiles
       topLevelBuildFiles
       functionalTestFiles
-      ./unit-test-data
     ] ++ lib.optionals (!finalAttrs.dontBuild || internalApiDocs) [
       ./boehmgc-coroutine-sp-fallback.diff
       ./doc
diff --git a/unit-test-data/libstore/common-protocol/content-address.bin b/tests/unit/libstore/data/libstore/common-protocol/content-address.bin
index 8f14bcdb3..8f14bcdb3 100644
--- a/unit-test-data/libstore/common-protocol/content-address.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/content-address.bin
diff --git a/unit-test-data/libstore/common-protocol/drv-output.bin b/tests/unit/libstore/data/libstore/common-protocol/drv-output.bin
index 800a45fd8..800a45fd8 100644
--- a/unit-test-data/libstore/common-protocol/drv-output.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/drv-output.bin
diff --git a/unit-test-data/libstore/common-protocol/optional-content-address.bin b/tests/unit/libstore/data/libstore/common-protocol/optional-content-address.bin
index f8cfe65ba..f8cfe65ba 100644
--- a/unit-test-data/libstore/common-protocol/optional-content-address.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/optional-content-address.bin
diff --git a/unit-test-data/libstore/common-protocol/optional-store-path.bin b/tests/unit/libstore/data/libstore/common-protocol/optional-store-path.bin
index 4fbca5576..4fbca5576 100644
--- a/unit-test-data/libstore/common-protocol/optional-store-path.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/optional-store-path.bin
diff --git a/unit-test-data/libstore/common-protocol/realisation.bin b/tests/unit/libstore/data/libstore/common-protocol/realisation.bin
index 2176c6c4a..2176c6c4a 100644
--- a/unit-test-data/libstore/common-protocol/realisation.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/realisation.bin
diff --git a/unit-test-data/libstore/common-protocol/set.bin b/tests/unit/libstore/data/libstore/common-protocol/set.bin
index ce11ede7f..ce11ede7f 100644
--- a/unit-test-data/libstore/common-protocol/set.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/set.bin
diff --git a/unit-test-data/libstore/common-protocol/store-path.bin b/tests/unit/libstore/data/libstore/common-protocol/store-path.bin
index 3fc05f298..3fc05f298 100644
--- a/unit-test-data/libstore/common-protocol/store-path.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/store-path.bin
diff --git a/unit-test-data/libstore/common-protocol/string.bin b/tests/unit/libstore/data/libstore/common-protocol/string.bin
index aa7b5a604..aa7b5a604 100644
--- a/unit-test-data/libstore/common-protocol/string.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/string.bin
diff --git a/unit-test-data/libstore/common-protocol/vector.bin b/tests/unit/libstore/data/libstore/common-protocol/vector.bin
index 7a37c8cd1..7a37c8cd1 100644
--- a/unit-test-data/libstore/common-protocol/vector.bin
+++ b/tests/unit/libstore/data/libstore/common-protocol/vector.bin
diff --git a/unit-test-data/libstore/derivation/bad-old-version-dyn-deps.drv b/tests/unit/libstore/data/libstore/derivation/bad-old-version-dyn-deps.drv
index 3cd1ded02..3cd1ded02 100644
--- a/unit-test-data/libstore/derivation/bad-old-version-dyn-deps.drv
+++ b/tests/unit/libstore/data/libstore/derivation/bad-old-version-dyn-deps.drv
diff --git a/unit-test-data/libstore/derivation/bad-version.drv b/tests/unit/libstore/data/libstore/derivation/bad-version.drv
index bbf75c114..bbf75c114 100644
--- a/unit-test-data/libstore/derivation/bad-version.drv
+++ b/tests/unit/libstore/data/libstore/derivation/bad-version.drv
diff --git a/unit-test-data/libstore/derivation/dynDerivationDeps.drv b/tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.drv
index cfffe48ec..cfffe48ec 100644
--- a/unit-test-data/libstore/derivation/dynDerivationDeps.drv
+++ b/tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.drv
diff --git a/unit-test-data/libstore/derivation/dynDerivationDeps.json b/tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.json
index 9dbeb1f15..9dbeb1f15 100644
--- a/unit-test-data/libstore/derivation/dynDerivationDeps.json
+++ b/tests/unit/libstore/data/libstore/derivation/dynDerivationDeps.json
diff --git a/unit-test-data/libstore/derivation/output-caFixedFlat.json b/tests/unit/libstore/data/libstore/derivation/output-caFixedFlat.json
index fe000ea36..fe000ea36 100644
--- a/unit-test-data/libstore/derivation/output-caFixedFlat.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-caFixedFlat.json
diff --git a/unit-test-data/libstore/derivation/output-caFixedNAR.json b/tests/unit/libstore/data/libstore/derivation/output-caFixedNAR.json
index 1afd60223..1afd60223 100644
--- a/unit-test-data/libstore/derivation/output-caFixedNAR.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-caFixedNAR.json
diff --git a/unit-test-data/libstore/derivation/output-caFixedText.json b/tests/unit/libstore/data/libstore/derivation/output-caFixedText.json
index 0b2cc8bbc..0b2cc8bbc 100644
--- a/unit-test-data/libstore/derivation/output-caFixedText.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-caFixedText.json
diff --git a/unit-test-data/libstore/derivation/output-caFloating.json b/tests/unit/libstore/data/libstore/derivation/output-caFloating.json
index 9115de851..9115de851 100644
--- a/unit-test-data/libstore/derivation/output-caFloating.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-caFloating.json
diff --git a/unit-test-data/libstore/derivation/output-deferred.json b/tests/unit/libstore/data/libstore/derivation/output-deferred.json
index 0967ef424..0967ef424 100644
--- a/unit-test-data/libstore/derivation/output-deferred.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-deferred.json
diff --git a/unit-test-data/libstore/derivation/output-impure.json b/tests/unit/libstore/data/libstore/derivation/output-impure.json
index 62b61cdca..62b61cdca 100644
--- a/unit-test-data/libstore/derivation/output-impure.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-impure.json
diff --git a/unit-test-data/libstore/derivation/output-inputAddressed.json b/tests/unit/libstore/data/libstore/derivation/output-inputAddressed.json
index 86c7f3a05..86c7f3a05 100644
--- a/unit-test-data/libstore/derivation/output-inputAddressed.json
+++ b/tests/unit/libstore/data/libstore/derivation/output-inputAddressed.json
diff --git a/unit-test-data/libstore/derivation/simple.drv b/tests/unit/libstore/data/libstore/derivation/simple.drv
index bda74ad25..bda74ad25 100644
--- a/unit-test-data/libstore/derivation/simple.drv
+++ b/tests/unit/libstore/data/libstore/derivation/simple.drv
diff --git a/unit-test-data/libstore/derivation/simple.json b/tests/unit/libstore/data/libstore/derivation/simple.json
index 20d0f8933..20d0f8933 100644
--- a/unit-test-data/libstore/derivation/simple.json
+++ b/tests/unit/libstore/data/libstore/derivation/simple.json
diff --git a/unit-test-data/libstore/serve-protocol/build-result-2.2.bin b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.2.bin
index ae684778b..ae684778b 100644
--- a/unit-test-data/libstore/serve-protocol/build-result-2.2.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.2.bin
diff --git a/unit-test-data/libstore/serve-protocol/build-result-2.3.bin b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.3.bin
index d51e08dfc..d51e08dfc 100644
--- a/unit-test-data/libstore/serve-protocol/build-result-2.3.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.3.bin
diff --git a/unit-test-data/libstore/serve-protocol/build-result-2.6.bin b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.6.bin
index b02c706ea..b02c706ea 100644
--- a/unit-test-data/libstore/serve-protocol/build-result-2.6.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/build-result-2.6.bin
diff --git a/unit-test-data/libstore/serve-protocol/content-address.bin b/tests/unit/libstore/data/libstore/serve-protocol/content-address.bin
index 8f14bcdb3..8f14bcdb3 100644
--- a/unit-test-data/libstore/serve-protocol/content-address.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/content-address.bin
diff --git a/unit-test-data/libstore/serve-protocol/drv-output.bin b/tests/unit/libstore/data/libstore/serve-protocol/drv-output.bin
index 800a45fd8..800a45fd8 100644
--- a/unit-test-data/libstore/serve-protocol/drv-output.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/drv-output.bin
diff --git a/unit-test-data/libstore/serve-protocol/optional-content-address.bin b/tests/unit/libstore/data/libstore/serve-protocol/optional-content-address.bin
index f8cfe65ba..f8cfe65ba 100644
--- a/unit-test-data/libstore/serve-protocol/optional-content-address.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/optional-content-address.bin
diff --git a/unit-test-data/libstore/serve-protocol/optional-store-path.bin b/tests/unit/libstore/data/libstore/serve-protocol/optional-store-path.bin
index 4fbca5576..4fbca5576 100644
--- a/unit-test-data/libstore/serve-protocol/optional-store-path.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/optional-store-path.bin
diff --git a/unit-test-data/libstore/serve-protocol/realisation.bin b/tests/unit/libstore/data/libstore/serve-protocol/realisation.bin
index 2176c6c4a..2176c6c4a 100644
--- a/unit-test-data/libstore/serve-protocol/realisation.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/realisation.bin
diff --git a/unit-test-data/libstore/serve-protocol/set.bin b/tests/unit/libstore/data/libstore/serve-protocol/set.bin
index ce11ede7f..ce11ede7f 100644
--- a/unit-test-data/libstore/serve-protocol/set.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/set.bin
diff --git a/unit-test-data/libstore/serve-protocol/store-path.bin b/tests/unit/libstore/data/libstore/serve-protocol/store-path.bin
index 3fc05f298..3fc05f298 100644
--- a/unit-test-data/libstore/serve-protocol/store-path.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/store-path.bin
diff --git a/unit-test-data/libstore/serve-protocol/string.bin b/tests/unit/libstore/data/libstore/serve-protocol/string.bin
index aa7b5a604..aa7b5a604 100644
--- a/unit-test-data/libstore/serve-protocol/string.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/string.bin
diff --git a/unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin b/tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin
index 8056ec055..8056ec055 100644
--- a/unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.3.bin
diff --git a/unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin b/tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin
index 521b5c423..521b5c423 100644
--- a/unit-test-data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/unkeyed-valid-path-info-2.4.bin
diff --git a/unit-test-data/libstore/serve-protocol/vector.bin b/tests/unit/libstore/data/libstore/serve-protocol/vector.bin
index 7a37c8cd1..7a37c8cd1 100644
--- a/unit-test-data/libstore/serve-protocol/vector.bin
+++ b/tests/unit/libstore/data/libstore/serve-protocol/vector.bin
diff --git a/unit-test-data/libstore/worker-protocol/build-result-1.27.bin b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.27.bin
index ae684778b..ae684778b 100644
--- a/unit-test-data/libstore/worker-protocol/build-result-1.27.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.27.bin
diff --git a/unit-test-data/libstore/worker-protocol/build-result-1.28.bin b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.28.bin
index 74bcd5cf9..74bcd5cf9 100644
--- a/unit-test-data/libstore/worker-protocol/build-result-1.28.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.28.bin
diff --git a/unit-test-data/libstore/worker-protocol/build-result-1.29.bin b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.29.bin
index b02c706ea..b02c706ea 100644
--- a/unit-test-data/libstore/worker-protocol/build-result-1.29.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/build-result-1.29.bin
diff --git a/unit-test-data/libstore/worker-protocol/content-address.bin b/tests/unit/libstore/data/libstore/worker-protocol/content-address.bin
index 8f14bcdb3..8f14bcdb3 100644
--- a/unit-test-data/libstore/worker-protocol/content-address.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/content-address.bin
diff --git a/unit-test-data/libstore/worker-protocol/derived-path-1.29.bin b/tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.29.bin
index 05ea7678a..05ea7678a 100644
--- a/unit-test-data/libstore/worker-protocol/derived-path-1.29.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.29.bin
diff --git a/unit-test-data/libstore/worker-protocol/derived-path-1.30.bin b/tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.30.bin
index 0729b2690..0729b2690 100644
--- a/unit-test-data/libstore/worker-protocol/derived-path-1.30.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/derived-path-1.30.bin
diff --git a/unit-test-data/libstore/worker-protocol/drv-output.bin b/tests/unit/libstore/data/libstore/worker-protocol/drv-output.bin
index 800a45fd8..800a45fd8 100644
--- a/unit-test-data/libstore/worker-protocol/drv-output.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/drv-output.bin
diff --git a/unit-test-data/libstore/worker-protocol/keyed-build-result-1.29.bin b/tests/unit/libstore/data/libstore/worker-protocol/keyed-build-result-1.29.bin
index c5b3c7f36..c5b3c7f36 100644
--- a/unit-test-data/libstore/worker-protocol/keyed-build-result-1.29.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/keyed-build-result-1.29.bin
diff --git a/unit-test-data/libstore/worker-protocol/optional-content-address.bin b/tests/unit/libstore/data/libstore/worker-protocol/optional-content-address.bin
index f8cfe65ba..f8cfe65ba 100644
--- a/unit-test-data/libstore/worker-protocol/optional-content-address.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/optional-content-address.bin
diff --git a/unit-test-data/libstore/worker-protocol/optional-store-path.bin b/tests/unit/libstore/data/libstore/worker-protocol/optional-store-path.bin
index 4fbca5576..4fbca5576 100644
--- a/unit-test-data/libstore/worker-protocol/optional-store-path.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/optional-store-path.bin
diff --git a/unit-test-data/libstore/worker-protocol/optional-trusted-flag.bin b/tests/unit/libstore/data/libstore/worker-protocol/optional-trusted-flag.bin
index 51b239409..51b239409 100644
--- a/unit-test-data/libstore/worker-protocol/optional-trusted-flag.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/optional-trusted-flag.bin
diff --git a/unit-test-data/libstore/worker-protocol/realisation.bin b/tests/unit/libstore/data/libstore/worker-protocol/realisation.bin
index 2176c6c4a..2176c6c4a 100644
--- a/unit-test-data/libstore/worker-protocol/realisation.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/realisation.bin
diff --git a/unit-test-data/libstore/worker-protocol/set.bin b/tests/unit/libstore/data/libstore/worker-protocol/set.bin
index ce11ede7f..ce11ede7f 100644
--- a/unit-test-data/libstore/worker-protocol/set.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/set.bin
diff --git a/unit-test-data/libstore/worker-protocol/store-path.bin b/tests/unit/libstore/data/libstore/worker-protocol/store-path.bin
index 3fc05f298..3fc05f298 100644
--- a/unit-test-data/libstore/worker-protocol/store-path.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/store-path.bin
diff --git a/unit-test-data/libstore/worker-protocol/string.bin b/tests/unit/libstore/data/libstore/worker-protocol/string.bin
index aa7b5a604..aa7b5a604 100644
--- a/unit-test-data/libstore/worker-protocol/string.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/string.bin
diff --git a/unit-test-data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin b/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
index e69ccbe83..e69ccbe83 100644
--- a/unit-test-data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
diff --git a/unit-test-data/libstore/worker-protocol/valid-path-info-1.15.bin b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin
index 7adc8dd44..7adc8dd44 100644
--- a/unit-test-data/libstore/worker-protocol/valid-path-info-1.15.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin
diff --git a/unit-test-data/libstore/worker-protocol/valid-path-info-1.16.bin b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.16.bin
index a72de6bd6..a72de6bd6 100644
--- a/unit-test-data/libstore/worker-protocol/valid-path-info-1.16.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.16.bin
diff --git a/unit-test-data/libstore/worker-protocol/vector.bin b/tests/unit/libstore/data/libstore/worker-protocol/vector.bin
index 7a37c8cd1..7a37c8cd1 100644
--- a/unit-test-data/libstore/worker-protocol/vector.bin
+++ b/tests/unit/libstore/data/libstore/worker-protocol/vector.bin