update testsuite (#928)

* update testsuite/testsuite.sh

* deprecate dist/travis/test.sh, use testsuite/testsuite.sh instead

2 files changed, 11 insertions, 129 deletions

diff --git a/dist/travis/test.sh b/dist/travis/test.sh
deleted file mode 100755
index 07326a235..000000000
--- a/dist/travis/test.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#! /bin/bash
-
-scriptdir=$(dirname $0)
-
-. "$scriptdir/utils.sh"
-disable_color
-
-echo "$0" "$@"
-
-# Stop in case of error
-set -e
-
-export ISGPL=false
-
-# Transform long options to short ones
-for arg in "$@"; do
-  shift
-  case "$arg" in
-      "--color"|"-color")   set -- "$@" "-c";;
-      "--gpl"|"-gpl")       set -- "$@" "-g";;
-      "--synth"|"-synth")   set -- "$@" "-s";;
-    *) set -- "$@" "$arg"
-  esac
-done
-# Parse args
-while getopts ":b:p:cgs" opt; do
-  case $opt in
-    c) enable_color;;
-    g) ISGPL=true;;
-    s) ISSYNTH=true;;
-    \?) printf "$ANSI_RED[GHDL - test] Invalid option: -$OPTARG $ANSI_NOCOLOR\n" >&2
-	exit 1 ;;
-    :)  printf "$ANSI_RED[GHDL - test] Option -$OPTARG requires an argument. $ANSI_NOCOLOR\n" >&2
-	exit 1 ;;
-  esac
-done
-
-rm -f test_ok
-
-export ENABLECOLOR
-if [ "x$GHDL" = "x" ]; then
-    export GHDL="$prefix/bin/ghdl"
-fi
-cd testsuite
-failures=""
-
-travis_start "tests.sanity" "$ANSI_YELLOW[GHDL - test] sanity $ANSI_NOCOLOR"
-cd sanity
-for d in [0-9]*; do
-    cd $d
-    if ./testsuite.sh > test.log 2>&1 ; then
-	echo "sanity $d: ok"
-	# Don't disp log
-    else
-	printf "${ANSI_RED}sanity $d: failed${ANSI_NOCOLOR}\n"
-	cat test.log
-	failures="$failures $d"
-    fi
-    cd ..
-    # Stop at the first failure
-    [ "$failures" = "" ] || break
-done
-cd ..
-travis_finish "tests.sanity"
-[ "$failures" = "" ] || exit 1
-
-if [ "x$ISGPL" != "xtrue" ]; then
-    travis_start "tests.gna" "$ANSI_YELLOW[GHDL - test] gna $ANSI_NOCOLOR"
-    cd gna
-    dirs=`./testsuite.sh --list-tests`
-    for d in $dirs; do
-	cd $d
-	if ./testsuite.sh > test.log 2>&1 ; then
-	    echo "gna $d: ok"
-	    # Don't disp log
-	else
-	    printf "${ANSI_RED}gna $d: failed${ANSI_NOCOLOR}\n"
-	    cat test.log
-	    failures="$failures $d"
-	fi
-	cd ..
-	# Stop at the first failure
-	[ "$failures" = "" ] || break
-    done
-    cd ..
-    travis_finish "tests.gna"
-    [ "$failures" = "" ] || exit 1
-fi
-
-travis_start "tests.vests" "$ANSI_YELLOW[GHDL - test] vests $ANSI_NOCOLOR"
-cd vests
-if ./testsuite.sh > vests.log 2>&1 ; then
-    printf "${ANSI_GREEN}Vests is OK$ANSI_NOCOLOR\n"
-    wc -l vests.log
-else
-    cat vests.log
-    printf "${ANSI_RED}Vests failure$ANSI_NOCOLOR\n"
-    failures=vests
-fi
-cd ..
-travis_finish "tests.vests"
-[ "$failures" = "" ] || exit 1
-
-if [ "x$ISSYNTH" = "xtrue" ]; then
-    travis_start "tests.synth" "$ANSI_YELLOW[GHDL - test] synth $ANSI_NOCOLOR"
-    cd synth
-    if ./testsuite.sh > synth.log 2>&1 ; then
-        printf "${ANSI_GREEN}Synth is OK$ANSI_NOCOLOR\n"
-        wc -l synth.log
-    else
-        cat synth.log
-        printf "${ANSI_RED}Synth failure$ANSI_NOCOLOR\n"
-        failures="synth"
-    fi
-    cd ..
-    travis_finish "tests.synth"
-    [ "$failures" = "" ] || exit 1
-fi
-
-$GHDL --version
-cd ..
-
-#---
-
-echo "[SUCCESSFUL]"
-touch test_ok
diff --git a/dist/travis/travis-ci.sh b/dist/travis/travis-ci.sh
index 60c557572..f5dd73e40 100755
--- a/dist/travis/travis-ci.sh
+++ b/dist/travis/travis-ci.sh
@@ -88,15 +88,23 @@ fi
 # Test
 
 if [ "$TRAVIS_OS_NAME" = "osx" ]; then
-    bash -c "prefix=$(realpath ./install-mcode) ${scriptdir}/test.sh $BUILD_CMD_OPTS"
+    bash -c "prefix=$(realpath ./install-mcode) ${scriptdir}/../../testsuite/testsuite.sh sanity gna vests"
 else
     # Build ghdl/ghdl:$GHDL_IMAGE_TAG image
     build_img_ghdl
     # Run test in docker container
-    $RUN "ghdl/ghdl:$GHDL_IMAGE_TAG" bash -c "GHDL=ghdl ${scriptdir}/test.sh $BUILD_CMD_OPTS"
+    tests="sanity"
+    if [ "x$EXTRA" != "xgpl" ]; then
+      tests="$tests gna"
+    fi
+    tests="$tests vests"
+    if [ "x$ISEXTRA" = "xsynth" ]; then
+      tests="$tests synth"
+    fi
+    $RUN "ghdl/ghdl:$GHDL_IMAGE_TAG" bash -c "GHDL=ghdl ${scriptdir}/../../testsuite/testsuite.sh $tests"
 fi
 
-if [ ! -f test_ok ]; then
+if [ ! -f "${scriptdir}/../../testsuite/test_ok" ]; then
     printf "$ANSI_RED[TRAVIS] TEST failed $ANSI_NOCOLOR\n"
     exit 1
 fi