Merge remote-tracking branch 'github-umarcor/py/GHDL' into paebbels/pyGHDL

2 files changed, 67 insertions, 9 deletions

diff --git a/testsuite/pyunit/testsuite.sh b/testsuite/pyunit/testsuite.sh
new file mode 100755
index 000000000..7eac028ca
--- /dev/null
+++ b/testsuite/pyunit/testsuite.sh
@@ -0,0 +1,57 @@
+#! /bin/sh
+
+# Driver for a testsuite.
+
+set -e
+
+# This is the only place where test dirs are specified.  Do not duplicate this
+# line
+#dirs="*[0-9]"
+#
+#failures=""
+#full=n
+#
+#for opt; do
+#  case "$opt" in
+#  -k | --keep-going)  full=y ;;
+#  --dir=*) dirs=`echo $opt | sed -e 's/--dir=//'` ;;
+#  --skip=*) d=`echo $opt | sed -e 's/--skip=//'`
+#            dirs=`echo "" $dirs | sed -e "s/ $d//"` ;;
+#  --start-at=*) d=`echo $opt | sed -e 's/--start-at=//'`
+#            dirs=`echo "" $dirs | sed -e "s/^.* $d//"`
+#            dirs="$d $dirs" ;;
+#  --list-tests) echo $dirs; exit 0;;
+#  *) echo "Unknown option $opt"
+#     exit 2
+#     ;;
+#  esac
+#done
+#
+#singlerun() {
+#  echo ""
+#  echo "dir $1:"
+#  cd $1
+#  if ! ./testsuite.sh; then
+#    echo "#################################################################"
+#    echo "######### FAILURE: $1"
+#    echo "#################################################################"
+#    if [ $2 = "y" ]; then
+#      failures="$failures $1"
+#    else
+#      exit 1;
+#    fi
+#  fi
+#  cd ..
+#}
+#
+#for i in $dirs; do singlerun $i $full; done
+#
+#if [ x"$failures" = x"" ]; then
+#    echo "tests are successful" && exit 0
+#else
+#    echo "test failed ($failures)" && exit 1
+#fi
+
+cd $(dirname "$0")/..
+
+python3 -m unittest pyunit
diff --git a/testsuite/testsuite.sh b/testsuite/testsuite.sh
index b77ccdbc5..b46ffcdc4 100755
--- a/testsuite/testsuite.sh
+++ b/testsuite/testsuite.sh
@@ -143,15 +143,16 @@ do_pyunit () {
   gstart "[GHDL - test] pyunit"
   cd pyunit
 
-  dirs=`./testsuite.sh --list-tests`
-  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
+  ./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