diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | dist/travis-ci.sh | 31 |
2 files changed, 29 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 1f0c4c8a6..75131c9bd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,6 @@ sudo: required dist: trusty before_install: - sudo apt-get update -qq - - sudo apt-get install -y gnat zlib1g-dev - - sudo apt-get install -y gnat llvm-3.5-dev llvm-3.5-tools + - sudo apt-get install -y gnat-4.8 zlib1g-dev + - sudo apt-get install -y llvm-3.5-dev llvm-3.5-tools script: ./dist/travis-ci.sh diff --git a/dist/travis-ci.sh b/dist/travis-ci.sh index 87b0c4612..5187e4799 100755 --- a/dist/travis-ci.sh +++ b/dist/travis-ci.sh @@ -4,12 +4,35 @@ # Stop in case of error set -e -# Build -./configure +CDIR=$PWD + +# Build mcode64 +mkdir build-mcode64 +mkdir install-mcode64 +cd build-mcode64 +../configure --prefix=$CDIR/install-mcode64 make +make install +cd .. -# Test -export GHDL=$PWD/ghdl_mcode +# Test mcode64 +export GHDL=$CDIR/install-mcode64/bin/ghdl cd testsuite gnatmake get_entities ./testsuite.sh +cd .. + +# build for llvm +mkdir build-llvm +mkdir install-llvm +cd build-llvm +../configure --prefix=$CDIR/install-llvm --with-llvm-config=llvm-config-3.5 +make +make install +cd .. + +# Test llvm +export GHDL=$CDIR/install-llvm/bin/ghdl +cd testsuite +./testsuite.sh +cd .. |