summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-09-30 14:11:42 +1000
committerDarren Tucker <dtucker@dtucker.net>2019-09-30 14:11:42 +1000
commit0a403bfde71c4b82147473298d3a60b4171468bd (patch)
tree1d9723f67b84ce2d60c4636794eabffcb9aa261d
parent4d59f7a5169c451ebf559aedec031ac9da2bf80c (diff)
Add SKIP_LTESTS for skipping specific tests.
-rw-r--r--regress/Makefile12
-rw-r--r--regress/README.regress1
2 files changed, 11 insertions, 2 deletions
diff --git a/regress/Makefile b/regress/Makefile
index 933fbb424..34c47e8cb 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -210,8 +210,16 @@ t12: $(OBJ)/t12.out
210t-exec: ${LTESTS:=.sh} 210t-exec: ${LTESTS:=.sh}
211 @if [ "x$?" = "x" ]; then exit 0; fi; \ 211 @if [ "x$?" = "x" ]; then exit 0; fi; \
212 for TEST in ""$?; do \ 212 for TEST in ""$?; do \
213 echo "run test $${TEST}" ... 1>&2; \ 213 skip=no; \
214 (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \ 214 for t in ""$${SKIP_LTESTS}; do \
215 if [ "x$${t}.sh" = "x$${TEST}" ]; then skip=yes; fi; \
216 done; \
217 if [ "x$${skip}" = "xno" ]; then \
218 echo "run test $${TEST}" ... 1>&2; \
219 (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
220 else \
221 echo skip test $${TEST} 1>&2; \
222 fi; \
215 done 223 done
216 224
217t-exec-interop: ${INTEROP_TESTS:=.sh} 225t-exec-interop: ${INTEROP_TESTS:=.sh}
diff --git a/regress/README.regress b/regress/README.regress
index ed9de874c..ac2e8487e 100644
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -25,6 +25,7 @@ SUDO: path to sudo/doas command, if desired. Note that some systems
25 (notably systems using PAM) require sudo to execute some tests. 25 (notably systems using PAM) require sudo to execute some tests.
26LTESTS: Whitespace separated list of tests (filenames without the .sh 26LTESTS: Whitespace separated list of tests (filenames without the .sh
27 extension) to run. 27 extension) to run.
28SKIP_LTESTS: Whitespace separated list of tests to skip.
28OBJ: used by test scripts to access build dir. 29OBJ: used by test scripts to access build dir.
29TEST_SHELL: shell used for running the test scripts. 30TEST_SHELL: shell used for running the test scripts.
30TEST_SSH_FAIL_FATAL: set to "yes" to make any failure abort the test 31TEST_SSH_FAIL_FATAL: set to "yes" to make any failure abort the test