Add SKIP_LTESTS for skipping specific tests.

diff --git a/regress/Makefile b/regress/Makefile
index 933fbb4243c13633b9b0276253bd0b0734de5110..34c47e8cbe64eccd81fe83ff118900b5ef9b86ac 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -210,8 +210,16 @@ t12: $(OBJ)/t12.out
 t-exec:        ${LTESTS:=.sh}
        @if [ "x$?" = "x" ]; then exit 0; fi; \
        for TEST in ""$?; do \
-               echo "run test $${TEST}" ... 1>&2; \
-               (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+               skip=no; \
+               for t in ""$${SKIP_LTESTS}; do \
+                       if [ "x$${t}.sh" = "x$${TEST}" ]; then skip=yes; fi; \
+               done; \
+               if [ "x$${skip}" = "xno" ]; then \
+                       echo "run test $${TEST}" ... 1>&2; \
+                       (env SUDO="${SUDO}" TEST_ENV=${TEST_ENV} ${TEST_SHELL} ${.CURDIR}/test-exec.sh ${.OBJDIR} ${.CURDIR}/$${TEST}) || exit $$?; \
+               else \
+                       echo skip test $${TEST} 1>&2; \
+               fi; \
        done
 
 t-exec-interop:        ${INTEROP_TESTS:=.sh}

diff --git a/regress/README.regress b/regress/README.regress
index ed9de874cbdfc1c339672b0b7d7397c8fc0e0fcf..ac2e8487e78e085a18f1755118087c358939f1dd 100644 (file)
--- a/regress/README.regress
+++ b/regress/README.regress
@@ -25,6 +25,7 @@ SUDO: path to sudo/doas command, if desired. Note that some systems
        (notably systems using PAM) require sudo to execute some tests.
 LTESTS: Whitespace separated list of tests (filenames without the .sh
        extension) to run.
+SKIP_LTESTS: Whitespace separated list of tests to skip.
 OBJ: used by test scripts to access build dir.
 TEST_SHELL: shell used for running the test scripts.
 TEST_SSH_FAIL_FATAL: set to "yes" to make any failure abort the test