diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2021-03-01 12:57:29 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2021-03-01 12:57:29 +0100 |
| commit | c32a7c3404702b1f4d216ccc46802951f3801136 (patch) | |
| tree | 73650400a658c2a7ed541e808eabe97916b026e8 /mk | |
| parent | 7d578aaba1ba716193f10bc9665248c9d187acd7 (diff) | |
| parent | 259d6778efd865ccd3b5fbf4f3a29002a7d58d93 (diff) | |
Merge remote-tracking branch 'origin/ca/move-tests-to-their-own-directory'
Diffstat (limited to 'mk')
| -rwxr-xr-x | mk/run_test.sh | 2 | ||||
| -rw-r--r-- | mk/tests.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mk/run_test.sh b/mk/run_test.sh index 6af5b070a..3783d3bf7 100755 --- a/mk/run_test.sh +++ b/mk/run_test.sh @@ -14,7 +14,7 @@ if [ -t 1 ]; then yellow="[33;1m" normal="[m" fi -(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null) +(cd tests && env ${TESTS_ENVIRONMENT} init.sh 2>/dev/null > /dev/null) log="$(cd $(dirname $1) && env ${TESTS_ENVIRONMENT} $(basename $1) 2>&1)" status=$? if [ $status -eq 0 ]; then diff --git a/mk/tests.mk b/mk/tests.mk index c1e140bac..21bdc5748 100644 --- a/mk/tests.mk +++ b/mk/tests.mk @@ -8,7 +8,7 @@ define run-install-test .PHONY: $1.test $1.test: $1 $(test-deps) - @env TEST_NAME=$(notdir $(basename $1)) TESTS_ENVIRONMENT="$(tests-environment)" mk/run_test.sh $1 < /dev/null + @env TEST_NAME=$(basename $1) TESTS_ENVIRONMENT="$(tests-environment)" mk/run_test.sh $1 < /dev/null endef |