From e644242c534e76bcd066edcb48880f85b6c49f53 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 00:25:12 +0100 Subject: ci: install python3 on temporary debian containers --- dist/ci-run.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From d855ec403d4e6cb7d88d58c9a54f7a157a7d02fe Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 00:27:07 +0100 Subject: testuite: run pyunit from the root of the repo --- testsuite/pyunit/testsuite.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testsuite/pyunit/testsuite.sh b/testsuite/pyunit/testsuite.sh index 7eac028ca..6f363bc9b 100755 --- a/testsuite/pyunit/testsuite.sh +++ b/testsuite/pyunit/testsuite.sh @@ -52,6 +52,6 @@ set -e # echo "test failed ($failures)" && exit 1 #fi -cd $(dirname "$0")/.. +cd $(dirname "$0")/../.. -python3 -m unittest pyunit +python3 -m unittest testsuite.pyunit -- cgit v1.2.3 From 403ce633036dc9611c78fc5a0460ea7b856bd848 Mon Sep 17 00:00:00 2001 From: umarcor Date: Tue, 29 Dec 2020 00:31:59 +0100 Subject: testuite/pyunit: set PYTHONPATH --- testsuite/pyunit/testsuite.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testsuite/pyunit/testsuite.sh b/testsuite/pyunit/testsuite.sh index 6f363bc9b..3de4b3951 100755 --- a/testsuite/pyunit/testsuite.sh +++ b/testsuite/pyunit/testsuite.sh @@ -54,4 +54,6 @@ set -e cd $(dirname "$0")/../.. +export PYTHONPATH=$(pwd)/pyGHDL + python3 -m unittest testsuite.pyunit -- cgit v1.2.3