From bfed10b2faea4ed43d21936b4564e799c669ae0d Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Mon, 28 Sep 2020 13:09:10 +0200 Subject: [PATCH] run-tests: add command 'all' 'all' includes test 'full', which now succeeds. --- test/run-tests.sh | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/test/run-tests.sh b/test/run-tests.sh index b3e460d..0b0197c 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -168,13 +168,26 @@ vmTestNixExpr() { EOF } +# A basic subset of tests to keep the total runtime within +# manageable bounds (<3 min on desktop systems). +# These are also run on the CI server. +basic() { + scenario=default buildTest "$@" + scenario=netns buildTest "$@" + scenario=full evalTest "$@" +} + +all() { + scenario=default buildTest "$@" + scenario=netns buildTest "$@" + scenario=full buildTest "$@" +} + build() { if [[ $scenario ]]; then buildTest "$@" else - scenario=default buildTest "$@" - scenario=netns buildTest "$@" - scenario=full evalTest "$@" + basic "$@" fi }