diff options
| author | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2020-12-29 00:46:47 +0100 |
|---|---|---|
| committer | Patrick Lehmann <Patrick.Lehmann@plc2.de> | 2020-12-29 00:46:47 +0100 |
| commit | f170010041fd95d1705d5f73b823b25b6963b850 (patch) | |
| tree | b48d0aba680834a93fb8e4327bbd5647795efce1 | |
| parent | 71a7c3b1102b888f0560de64d9efaa48d8a3738f (diff) | |
| parent | 403ce633036dc9611c78fc5a0460ea7b856bd848 (diff) | |
| download | ghdl-f170010041fd95d1705d5f73b823b25b6963b850.tar.gz ghdl-f170010041fd95d1705d5f73b823b25b6963b850.tar.bz2 ghdl-f170010041fd95d1705d5f73b823b25b6963b850.zip | |
Merge remote-tracking branch 'github-umarcor/py/GHDL' into paebbels/pyGHDL
| -rwxr-xr-x | dist/ci-run.sh | 2 | ||||
| -rwxr-xr-x | testsuite/pyunit/testsuite.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/dist/ci-run.sh b/dist/ci-run.sh index 70e6b6d44..928fa201a 100755 --- a/dist/ci-run.sh +++ b/dist/ci-run.sh @@ -425,7 +425,7 @@ ci_run () { # Build ghdl/ghdl:$GHDL_IMAGE_TAG image build_img_ghdl case "$GHDL_IMAGE_TAG" in - *ubuntu*) + *ubuntu*|*buster*) GHDL_TEST_IMAGE="test:$GHDL_IMAGE_TAG-py" docker build -t "$GHDL_TEST_IMAGE" - <<-EOF FROM ghdl/ghdl:$GHDL_IMAGE_TAG diff --git a/testsuite/pyunit/testsuite.sh b/testsuite/pyunit/testsuite.sh index 7eac028ca..3de4b3951 100755 --- a/testsuite/pyunit/testsuite.sh +++ b/testsuite/pyunit/testsuite.sh @@ -52,6 +52,8 @@ set -e # echo "test failed ($failures)" && exit 1 #fi -cd $(dirname "$0")/.. +cd $(dirname "$0")/../.. -python3 -m unittest pyunit +export PYTHONPATH=$(pwd)/pyGHDL + +python3 -m unittest testsuite.pyunit |