diff options
| author | Bryan Drewery <bryan@shatow.net> | 2019-10-03 01:48:09 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2019-10-03 01:48:09 +0300 |
| commit | da7d68703f8539c6ba8a01fb7dec918434214d57 (patch) | |
| tree | e5fb53193d7288240ddb4d045ac286b87c3e96e6 /test | |
| parent | 29d90a7be2e1240c5fa1db8aed49d3a7d67d1a43 (diff) | |
cirrus: Prep test jail in its own script
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile | 3 | ||||
| -rw-r--r-- | test/common.bulk.sh | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/test/Makefile b/test/Makefile index f298c61e..59d93a03 100644 --- a/test/Makefile +++ b/test/Makefile @@ -43,6 +43,9 @@ TESTS=\ all: check check-stock +prep: .PHONY + @sh prep.sh + check: .PHONY @echo "Running tests against modified sh" @sh runtests.sh sh ${TESTS} diff --git a/test/common.bulk.sh b/test/common.bulk.sh index 5bd5df38..6e3b8c17 100644 --- a/test/common.bulk.sh +++ b/test/common.bulk.sh @@ -357,10 +357,6 @@ INJAIL_HOST=1 . common.sh -if [ ${ALL:-0} -eq 0 ]; then - assert_not "" "${LISTPORTS}" "LISTPORTS empty" -fi - SUDO= if [ $(id -u) -ne 0 ]; then if ! which sudo >/dev/null 2>&1; then @@ -393,6 +389,13 @@ if [ -z "${JAILMNT}" ]; then echo "Done setting up test jail" >&2 echo >&2 fi +if [ ${BOOTSTRAP_ONLY:-0} -eq 1 ]; then + exit 0 +fi + +if [ ${ALL:-0} -eq 0 ]; then + assert_not "" "${LISTPORTS}" "LISTPORTS empty" +fi . ${SCRIPTPREFIX}/common.sh |