merge testsuite/python into testsuite/pyunit

1 files changed, 25 insertions, 3 deletions

diff --git a/testsuite/testsuite.sh b/testsuite/testsuite.sh
index fd686ccd0..b46ffcdc4 100755
--- a/testsuite/testsuite.sh
+++ b/testsuite/testsuite.sh
@@ -112,7 +112,7 @@ do_sanity () {
   [ "$failures" = "" ] || exit 1
 }
 
-# The GNA testsuite: regression testsuite using reports/issues from gna.org
+# The GNA testsuite: regression testsuite using reports/issues from gna.org and from GitHub
 do_gna () {
   gstart "[GHDL - test] gna"
   cd gna
@@ -138,6 +138,27 @@ do_gna () {
   [ "$failures" = "" ] || exit 1
 }
 
+# The Python Unit testsuite: regression testsuite for Python bindings to libghdl
+do_pyunit () {
+  gstart "[GHDL - test] pyunit"
+  cd pyunit
+
+  ./testsuite.sh
+
+#  if ./testsuite.sh > test.log 2>&1 ; then
+#    printf "pyunit: ${ANSI_GREEN}ok${ANSI_NOCOLOR}\n"
+#    # Don't disp log
+#  else
+#    printf "pyunit: ${ANSI_RED}failed${ANSI_NOCOLOR}\n"
+#    cat test.log
+#    failures="$failures"
+#  fi
+
+  cd ..
+  gend
+  [ "$failures" = "" ] || exit 1
+}
+
 # The VESTS testsuite: compliance testsuite, from: https://github.com/nickg/vests.git 388250486a
 do_vests () {
   gstart "[GHDL - test] vests"
@@ -226,7 +247,7 @@ for opt; do
   esac
 done
 
-if [ "x$tests" = "x" ]; then tests="sanity gna vests synth vpi"; fi
+if [ "x$tests" = "x" ]; then tests="sanity pyunit gna vests synth vpi"; fi
 
 echo "tests: $tests"
 
@@ -234,10 +255,11 @@ echo "tests: $tests"
 do_test() {
   case $1 in
     sanity) do_sanity;;
+    pyunit) do_pyunit;;
     gna)    do_gna;;
     vests)  do_vests;;
     synth)  do_synth;;
-    vpi) do_vpi;;
+    vpi)    do_vpi;;
     *)
       printf "${ANSI_RED}$0: test name '$1' is unknown${ANSI_NOCOLOR}\n"
       exit 1;;