From 8ca4f762422fa2488876fe9ecb26cf15c82f262f Mon Sep 17 00:00:00 2001 From: Dan Kortschak Date: Sat, 30 Mar 2019 09:51:30 +1030 Subject: [PATCH] travis: don't source test invocation or set -e This had the effect of killing the travis script when a t.Fatal was hit. As noted in the comment that was removed - a non-zero exit status makes set -e exit, but this exits from the build script. The behaviour is retained in the install.sh script because it makes sense there. --- .travis.yml | 2 +- .travis/linux/OpenBLAS/test.sh | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) mode change 100644 => 100755 .travis/linux/OpenBLAS/test.sh diff --git a/.travis.yml b/.travis.yml index d588d0da..1b56adee 100644 --- a/.travis.yml +++ b/.travis.yml @@ -68,7 +68,7 @@ install: script: - ${TRAVIS_BUILD_DIR}/.travis/check-imports.sh - ${TRAVIS_BUILD_DIR}/.travis/check-copyright.sh - - source ${TRAVIS_BUILD_DIR}/.travis/$TRAVIS_OS_NAME/$BLAS_LIB/test.sh + - ${TRAVIS_BUILD_DIR}/.travis/$TRAVIS_OS_NAME/$BLAS_LIB/test.sh - test -z "$(gofmt -d .)" # This is run last since it alters the tree. - ${TRAVIS_BUILD_DIR}/.travis/check-generate.sh diff --git a/.travis/linux/OpenBLAS/test.sh b/.travis/linux/OpenBLAS/test.sh old mode 100644 new mode 100755 index 1a9378f7..e5700300 --- a/.travis/linux/OpenBLAS/test.sh +++ b/.travis/linux/OpenBLAS/test.sh @@ -1,4 +1,6 @@ -set -ex +#!/bin/bash + +set -x go env go get -d -t -v ./... @@ -6,12 +8,4 @@ export CGO_LDFLAGS="-L/usr/lib -lopenblas" go test -a -v ./... if [[ $TRAVIS_SECURE_ENV_VARS = "true" ]]; then bash -c "$GOPATH/src/gonum.org/v1/netlib/.travis/test-coverage.sh"; fi -# travis compiles commands in script and then executes in bash. By adding -# set -e we are changing the travis build script's behavior, and the set -# -e lives on past the commands we are providing it. Some of the travis -# commands are supposed to exit with non zero status, but then continue -# executing. set -x makes the travis log files extremely verbose and -# difficult to understand. -# -# see travis-ci/travis-ci#5120 -set +ex +set +x