forked from lix-project/lix
support <program>_ENV variables
this lets us set per-test-program environment variables rather than only
a single, global default. this was supported in nix originally but
might've gone partially missing in the upstream backports process?
Change-Id: Iad0919841b1b6d11e0b7ebd3920449a62f544e77
This commit is contained in:
parent
1b8662b85c
commit
06952cf7c4
57 changed files with 4 additions and 2 deletions
|
@ -6,6 +6,9 @@ programs-list :=
|
||||||
# - $(1)_NAME: the name of the program (e.g. ‘foo’); defaults to
|
# - $(1)_NAME: the name of the program (e.g. ‘foo’); defaults to
|
||||||
# $(1).
|
# $(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
|
# - $(1)_DIR: the directory where the (non-installed) program will be
|
||||||
# placed.
|
# placed.
|
||||||
#
|
#
|
||||||
|
@ -87,6 +90,6 @@ define build-program
|
||||||
# Phony target to run this program (typically as a dependency of 'check').
|
# Phony target to run this program (typically as a dependency of 'check').
|
||||||
.PHONY: $(1)_RUN
|
.PHONY: $(1)_RUN
|
||||||
$(1)_RUN: $$($(1)_PATH)
|
$(1)_RUN: $$($(1)_PATH)
|
||||||
$(trace-test) $$(UNIT_TEST_ENV) $$($(1)_PATH)
|
$(trace-test) $$($(1)_ENV) $$($(1)_PATH)
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
|
|
@ -106,7 +106,6 @@ in stdenv.mkDerivation (finalAttrs: {
|
||||||
configureFiles
|
configureFiles
|
||||||
topLevelBuildFiles
|
topLevelBuildFiles
|
||||||
functionalTestFiles
|
functionalTestFiles
|
||||||
./unit-test-data
|
|
||||||
] ++ lib.optionals (!finalAttrs.dontBuild || internalApiDocs) [
|
] ++ lib.optionals (!finalAttrs.dontBuild || internalApiDocs) [
|
||||||
./boehmgc-coroutine-sp-fallback.diff
|
./boehmgc-coroutine-sp-fallback.diff
|
||||||
./doc
|
./doc
|
||||||
|
|
Loading…
Reference in a new issue