diff options
author | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2020-07-12 11:51:42 +0200 |
---|---|---|
committer | Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com> | 2020-11-22 16:03:54 +0100 |
commit | d374d48d7073cbaf0ce58da887c0ad7a2ad33b46 (patch) | |
tree | 503d7156e3341f98e14ce483f0dab7563267ed47 | |
parent | ce787a6e3210333a71f5074e5775885428e8b73c (diff) | |
download | uwsgi-d374d48d7073cbaf0ce58da887c0ad7a2ad33b46.tar.gz |
tests: make the tests CI config file a parameter
So we don't need to duplicate it right now
-rw-r--r-- | .travis.yml | 2 | ||||
-rwxr-xr-x | tests/travis.sh | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 51c3134f..26585514 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,7 +42,7 @@ script: - echo -e "\n\n>>> Building dummy plugin" - /usr/bin/python uwsgiconfig.py --plugin plugins/dummy base - echo -e "\n\n>>> Building done, starting tests" - - ./tests/travis.sh + - ./tests/travis.sh .travis.yml before_install: - sudo apt-get update -qq diff --git a/tests/travis.sh b/tests/travis.sh index 3c61e206..3ec948c2 100755 --- a/tests/travis.sh +++ b/tests/travis.sh @@ -2,6 +2,7 @@ set -u +CI_CONFIG="$1" txtund=$(tput sgr 0 1) # underline txtbld=$(tput bold) # bold bldred=${txtbld}$(tput setaf 1) # red @@ -88,14 +89,14 @@ while read PV ; do for WSGI_FILE in tests/staticfile.py tests/testworkers.py tests/testrpc.py ; do test_python $PV $WSGI_FILE done -done < <(cat .travis.yml | grep "plugins/python base" | sed s_".*plugins/python base "_""_g) +done < <(cat "$CI_CONFIG" | grep "plugins/python base" | sed s_".*plugins/python base "_""_g) while read RV ; do for RACK in examples/config2.ru ; do test_rack $RV $RACK done -done < <(cat .travis.yml | grep "plugins/rack base" | sed s_".*plugins/rack base "_""_g) +done < <(cat "$CI_CONFIG" | grep "plugins/rack base" | sed s_".*plugins/rack base "_""_g) echo "${bldgre}>>> $SUCCESS SUCCESSFUL TEST(S)${txtrst}" |