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

2 files changed, 2 insertions, 72 deletions

diff --git a/testsuite/pyunit/testsuite.sh b/testsuite/pyunit/testsuite.sh
deleted file mode 100755
index 3de4b3951..000000000
--- a/testsuite/pyunit/testsuite.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /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")/../..
-
-export PYTHONPATH=$(pwd)/pyGHDL
-
-python3 -m unittest testsuite.pyunit
diff --git a/testsuite/testsuite.sh b/testsuite/testsuite.sh
index b46ffcdc4..c11b90993 100755
--- a/testsuite/testsuite.sh
+++ b/testsuite/testsuite.sh
@@ -141,22 +141,11 @@ do_gna () {
 # The Python Unit testsuite: regression testsuite for Python bindings to libghdl
 do_pyunit () {
   gstart "[GHDL - test] pyunit"
-  cd pyunit
 
-  ./testsuite.sh
+  cd $(dirname "$0")/..
+  PYTHONPATH=$(pwd) python3 -m unittest testsuite.pyunit
 
-#  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