aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortgingold <tgingold@users.noreply.github.com>2017-02-09 06:16:50 +0100
committerGitHub <noreply@github.com>2017-02-09 06:16:50 +0100
commit427ee87b266e0cc6103f8e44ad01acfd55f31772 (patch)
treed8d1db6fa3d6a4f1e5db503f6989801a56171765
parent7873da82231e872021311ece34644c323e5e99d8 (diff)
parentcbfb15b79968b93cef7960e0380a1a35beba523a (diff)
downloadghdl-427ee87b266e0cc6103f8e44ad01acfd55f31772.tar.gz
ghdl-427ee87b266e0cc6103f8e44ad01acfd55f31772.tar.bz2
ghdl-427ee87b266e0cc6103f8e44ad01acfd55f31772.zip
Merge pull request #271 from 1138-4EB/travis-sh-envvar
Allow not to pass `$BLD` as argument to <travis-ci.sh>
-rwxr-xr-xdist/travis-ci.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh
index 6a84b08af..119eed005 100755
--- a/dist/travis-ci.sh
+++ b/dist/travis-ci.sh
@@ -5,7 +5,8 @@
set -e
CDIR=$PWD
-BLD=$1
+
+if [ $# -ne 0 ]; then BLD=$1; fi
# Display environment
echo "Environment:"
@@ -58,7 +59,7 @@ echo "creating $PKG_FILE"
tar -zcvf $PKG_FILE -C $prefix .
# Test
-export GHDL="$CDIR/install-$1/bin/ghdl"
+export GHDL="$CDIR/install-$BLD/bin/ghdl"
cd testsuite
gnatmake get_entities
./testsuite.sh