1
0
Fork 0

WIP PR to figure out why travis is failing (#471)

Make travis use a docker image with pre-built toolchain and verilator
This commit is contained in:
Henry Cook 2016-12-04 13:10:13 -08:00 committed by GitHub
parent 4234cff074
commit 9fb7934a37
2 changed files with 12 additions and 37 deletions

View File

@ -1,37 +1,18 @@
git:
submodules: false
language: scala
# run on new infrastructure
sudo: false
sudo: required
services:
- docker
cache:
apt: true
directories:
$HOME/.ivy2
regression/install
emulator/verilator
# packages needed to build riscv-tools
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- gcc-4.8
- g++-4.8
- gperf
- autoconf
- automake
- autotools-dev
- libmpc-dev
- libmpfr-dev
- libgmp-dev
- gawk
- build-essential
- bison
- flex
- texinfo
env:
global:
- CACHE_NAME=RocketChip
- RISCV=/opt/riscv
- TORTURE_CONFIG=default
matrix:
- SUITE=RocketSuiteA
- SUITE=RocketSuiteB
@ -47,15 +28,9 @@ branches:
- boom
- /^hurricane.*$/
install:
- make tools verilator -C regression SUITE=none
before_install:
- export CXX=g++-4.8 CC=gcc-4.8
- docker pull hcook/docker-riscv
script:
- make emulator-ndebug -C regression SUITE=$SUITE TORTURE_CONFIG=default
- make emulator-regression-tests -C regression SUITE=$SUITE TORTURE_CONFIG=default
before_cache:
- ls -t regression/install | tail -n+2 | sed s@^@regression/install/@ | xargs rm -rf
- docker run -v /home/travis/build/ucb-bar/rocket-chip:/opt/riscv/test hcook/docker-riscv /bin/sh -c "which verilator; echo $INSTALLED_VERILATOR"
- docker run -v $HOME/.ivy2:/opt/riscv/test/.ivy2 -v /home/travis/build/ucb-bar/rocket-chip:/opt/riscv/test hcook/docker-riscv /bin/sh -c "make emulator-ndebug -C regression SUITE=$SUITE; make emulator-regression-tests -C regression SUITE=$SUITE"

View File

@ -22,8 +22,8 @@ $(generated_dir_debug)/%.fir $(generated_dir_debug)/%.prm $(generated_dir_debug)
# Build and install our own Verilator, to work around versionining issues.
VERILATOR_VERSION=3.884
VERILATOR_SRCDIR=verilator/src/verilator-$(VERILATOR_VERSION)
INSTALLED_VERILATOR=$(abspath verilator/install/bin/verilator)
VERILATOR_SRCDIR ?= verilator/src/verilator-$(VERILATOR_VERSION)
INSTALLED_VERILATOR ?= $(abspath verilator/install/bin/verilator)
$(INSTALLED_VERILATOR): $(VERILATOR_SRCDIR)/bin/verilator
$(MAKE) -C $(VERILATOR_SRCDIR) installbin installdata
touch $@