From 4a04f914b836c21a6d036f72846f8698d907cf43 Mon Sep 17 00:00:00 2001
From: 1138-4EB <1138-4EB@users.noreply.github.com>
Date: Wed, 18 Sep 2019 20:17:09 +0200
Subject: update testsuite (#928)

* update testsuite/testsuite.sh

* deprecate dist/travis/test.sh, use testsuite/testsuite.sh instead
---
 dist/travis/travis-ci.sh | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

(limited to 'dist/travis/travis-ci.sh')

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
-- 
cgit v1.2.3