Skip to content

Commit

Permalink
Fix the test dependencies
Browse files Browse the repository at this point in the history
Reuse the pre-existing list rather than the one written as part of NixOS#3777
  • Loading branch information
thufschmitt committed Jul 3, 2020
1 parent 5596f87 commit 5101ed1
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
5 changes: 4 additions & 1 deletion mk/tests.mk
@@ -1,10 +1,13 @@
# Run program $1 as part of ‘make installcheck’.

test-deps =

define run-install-test

installcheck: $1.test

.PHONY: $1.test
$1.test: $1 tests/common.sh tests/init.sh
$1.test: $1 $(test-deps)
@env TEST_NAME=$1 TESTS_ENVIRONMENT="$(tests-environment)" mk/run_test.sh $1

endef
Expand Down
2 changes: 1 addition & 1 deletion tests/local.mk
Expand Up @@ -40,4 +40,4 @@ tests-environment = NIX_REMOTE= $(bash) -e

clean-files += $(d)/common.sh

installcheck: $(d)/common.sh $(d)/config.nix $(d)/plugins/libplugintest.$(SO_EXT)
test-deps += tests/common.sh tests/config.nix tests/plugins/libplugintest.$(SO_EXT)

0 comments on commit 5101ed1

Please sign in to comment.