From 3a6d076bf5d49d435fa8868d550c3f1668ef265c Mon Sep 17 00:00:00 2001 From: Chris Waldon Date: Wed, 15 Jan 2020 08:57:45 -0500 Subject: travis: avoid running live python tests in TravisCI Signed-off-by: Chris Waldon Signed-off-by: Paul Moore (imported from commit b9dddcc74ddabf6c281c9be44a9b0f8891ed7b45) --- .travis.yml | 2 +- tests/regression | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 38432f1..e29c815 100644 --- a/.travis.yml +++ b/.travis.yml @@ -59,7 +59,7 @@ script: - ./configure --enable-python - make check-build - LIBSECCOMP_TSTCFG_STRESSCNT=5 make check - - LIBSECCOMP_TSTCFG_TYPE=live make -C tests check + - LIBSECCOMP_TSTCFG_TYPE=live LIBSECCOMP_TSTCFG_MODE_LIST=c make -C tests check # ubuntu 14.04 (trusty) clang has problems with the cython generated code - make clean && ./configure && scan-build --status-bugs make diff --git a/tests/regression b/tests/regression index ec487d1..56822fb 100755 --- a/tests/regression +++ b/tests/regression @@ -94,6 +94,7 @@ libseccomp regression test automation script optional arguments: -h show this help message and exit -m MODE specified the test mode [c (default), python] + can also be set via LIBSECCOMP_TSTCFG_MODE_LIST env variable -a specifies all tests are to be run -b BATCH_NAME specifies batch of tests to be run -l [LOG] specifies log file to write test results to @@ -1025,6 +1026,9 @@ while getopts "ab:gl:m:s:t:T:vh" opt; do esac done +# use mode list from environment if provided +[[ -z $mode_list && -n $LIBSECCOMP_TSTCFG_MODE_LIST ]] && mode_list=$LIBSECCOMP_TSTCFG_MODE_LIST + # determine the mode test automatically if [[ -z $mode_list ]]; then # always perform the native c tests -- cgit v1.2.1