diff options
author | umarcor <unai.martinezcorral@ehu.eus> | 2020-12-29 01:53:24 +0100 |
---|---|---|
committer | umarcor <unai.martinezcorral@ehu.eus> | 2020-12-29 01:53:24 +0100 |
commit | 12ef35a90d65dbd6f542698f6c517403402b4fa5 (patch) | |
tree | 920ece6a061582589323d172e04259d01bd5eaa9 /dist | |
parent | 8816082c3787784f8475f4c59a4a84c5704e15d0 (diff) | |
download | ghdl-12ef35a90d65dbd6f542698f6c517403402b4fa5.tar.gz ghdl-12ef35a90d65dbd6f542698f6c517403402b4fa5.tar.bz2 ghdl-12ef35a90d65dbd6f542698f6c517403402b4fa5.zip |
ci: skip pyunit on Ubuntu <20
Diffstat (limited to 'dist')
-rwxr-xr-x | dist/ci-run.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/dist/ci-run.sh b/dist/ci-run.sh index e71229194..5a78d080f 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -424,8 +424,11 @@ ci_run () { else # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl + + tests="sanity" + case "$GHDL_IMAGE_TAG" in - *ubuntu*|*buster*) + *ubuntu20*|*buster*) GHDL_TEST_IMAGE="test:$GHDL_IMAGE_TAG-py" docker build -t "$GHDL_TEST_IMAGE" . -f- <<-EOF # syntax=docker/dockerfile:experimental @@ -434,21 +437,26 @@ RUN apt update -qq && apt install -y python3 python3-pip RUN --mount=type=bind,src=./,target=/tmp/ghdl/ \ pip3 install -r /tmp/ghdl/testsuite/requirements.txt EOF + tests+=" pyunit" ;; *) GHDL_TEST_IMAGE="ghdl/ghdl:$GHDL_IMAGE_TAG" ;; esac - # Run test in docker container - tests="sanity pyunit" + if [ "x$ISGPL" != "xtrue" ]; then - tests="$tests gna" + tests+=" gna" fi - tests="$tests vests" + + tests+=" vests" + if [ "x$ISSYNTH" = "xtrue" ]; then - tests="$tests synth" + tests+=" synth" fi - tests="$tests vpi" + + tests+=" vpi" + + # Run tests in docker container $RUN "$GHDL_TEST_IMAGE" bash -c "GHDL=ghdl ./testsuite/testsuite.sh $tests" fi |