diff options
| author | Tristan Gingold <tgingold@free.fr> | 2017-08-18 04:41:00 +0200 |
|---|---|---|
| committer | Tristan Gingold <tgingold@free.fr> | 2017-08-18 04:41:00 +0200 |
| commit | 5fe560e5d6eb6bd967b0db3fa280deb29ad5d0d6 (patch) | |
| tree | 704ad7bbbf98cec40947482323376f8177d9612f /dist/linux | |
| parent | 4c80a688380e961ae08a05dbc30acb44cf58e8c5 (diff) | |
| download | ghdl-5fe560e5d6eb6bd967b0db3fa280deb29ad5d0d6.tar.gz ghdl-5fe560e5d6eb6bd967b0db3fa280deb29ad5d0d6.tar.bz2 ghdl-5fe560e5d6eb6bd967b0db3fa280deb29ad5d0d6.zip | |
travis-ci: move tests driver to buildtest.sh, clean cache before setting it.
Diffstat (limited to 'dist/linux')
| -rwxr-xr-x | dist/linux/buildtest.sh | 40 | ||||
| -rwxr-xr-x | dist/linux/docker-buildtest.sh | 2 |
2 files changed, 32 insertions, 10 deletions
diff --git a/dist/linux/buildtest.sh b/dist/linux/buildtest.sh index 86722b785..c97e9370c 100755 --- a/dist/linux/buildtest.sh +++ b/dist/linux/buildtest.sh @@ -43,27 +43,27 @@ cd "build-$BLD" #--- printf "$ANSI_BLUE[$TASK| GHDL] Environment $ANSI_NOCOLOR\n" -env 1>> ../log.log 2>&1 +env #--- printf "$ANSI_BLUE[$TASK| GHDL - build] Configure $ANSI_NOCOLOR\n" case "$BLD" in mcode) - ../configure "--prefix=$prefix" 1>> ../log.log 2>&1 + ../configure "--prefix=$prefix" ;; llvm) - ../configure "--prefix=$prefix" "--with-llvm-config" 1>> ../log.log 2>&1 + ../configure "--prefix=$prefix" "--with-llvm-config" ;; llvm-3.5) - ../configure "--prefix=$prefix" "--with-llvm-config=llvm-config-3.5" 1>> ../log.log 2>&1 + ../configure "--prefix=$prefix" "--with-llvm-config=llvm-config-3.5" MAKEOPTS="CXX=clang++" ;; llvm-3.8) - ../configure "--prefix=$prefix" "--with-llvm-config=llvm-config-3.8" 1>> ../log.log 2>&1 + ../configure "--prefix=$prefix" "--with-llvm-config=llvm-config-3.8" MAKEOPTS="CXX=clang++-3.8" ;; @@ -78,16 +78,23 @@ esac #--- +echo "travis_fold:start:build.$TASK" printf "$ANSI_BLUE[$TASK| GHDL - build] Make $ANSI_NOCOLOR\n" -make $MAKEOPTS 1>> ../log.log 2>&1 +make $MAKEOPTS +echo "travis_fold:end:build.$TASK" + +echo "travis_fold:start:install.$TASK" printf "$ANSI_BLUE[$TASK| GHDL - build] Install $ANSI_NOCOLOR\n" -make install 1>> ../log.log 2>&1 +make install cd .. +echo "travis_fold:end:install.$TASK" #--- +echo "travis_fold:start:tar.$TASK" printf "$ANSI_BLUE[$TASK| GHDL] Create package $ANSI_DARKCYAN$PKG_FILE $ANSI_NOCOLOR\n" -tar -zcvf "$PKG_FILE" -C "$prefix" . 1>> log.log 2>&1 +tar -zcvf "$PKG_FILE" -C "$prefix" . +echo "travis_fold:end:tar.$TASK" #--- @@ -95,10 +102,25 @@ export ENABLECOLOR="$ENABLECOLOR" export TASK="$TASK" export GHDL="$CDIR/install-$BLD/bin/ghdl" cd testsuite + +echo "travis_fold:start:tests.gna.$TASK" +printf "$ANSI_BLUE[$TASK| GHDL - test] gna $ANSI_NOCOLOR\n" +cd gna ./testsuite.sh cd .. +echo "travis_fold:end:tests.gna.$TASK" + +echo "travis_fold:start:tests.vests.$TASK" +printf "$ANSI_BLUE[$TASK| GHDL - test] vests $ANSI_NOCOLOR\n" +cd vests +./testsuite.sh +cd .. +echo "travis_fold:end:tests.vests.$TASK" + +$GHDL --version +cd .. #--- # Do not remove this line, and don't write anything below, since it is used to identify successful builds -echo "[$TASK|SUCCESSFUL]" 1>> log.log 2>&1 +echo "[$TASK|SUCCESSFUL]" diff --git a/dist/linux/docker-buildtest.sh b/dist/linux/docker-buildtest.sh index f34fc246d..270b9343d 100755 --- a/dist/linux/docker-buildtest.sh +++ b/dist/linux/docker-buildtest.sh @@ -61,6 +61,6 @@ if [ -n "$GRAB_SRCS" ]; then else - docker run --rm -tv $(pwd):/work:Z -w="/work" "$DOCKER_IMG" sh -c "./dist/linux/buildtest.sh $ENABLECOLOR -t $TASK -b $BLD -f $PKG_FILE" + docker run --rm -tv $(pwd):/work:Z -w="/work" "$DOCKER_IMG" sh -c "./dist/linux/buildtest.sh $ENABLECOLOR -t $TASK -b $BLD -f $PKG_FILE > log.log 2>&1" fi |