From d44d3040fd8d31c590f2f76ec085a63b778d113c Mon Sep 17 00:00:00 2001 From: Florian Zaruba Date: Tue, 6 Feb 2018 13:36:47 +0100 Subject: [PATCH] Skipp elf generation and export env flags for fesvr --- .travis.yml | 6 +++++- ci/build-riscv-tests.sh | 14 +++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index c23d0674f..83a124812 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,6 +41,11 @@ branches: before_install: - export CXX=g++-4.8 CC=gcc-4.8 - ci/make-tmp.sh + - export LIBRARY_PATH=$LIBRARY_PATH:$CI_PROJECT_DIR/tmp/lib + - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$CI_PROJECT_DIR/tmp/lib + - export C_INCLUDE_PATH=$C_INCLUDE_PATH:$CI_PROJECT_DIR/tmp/include + - export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$CI_PROJECT_DIR/tmp/include + - export VERILATOR_ROOT=$TRAVIS_BUILD_DIR/tmp/verilator-3.918/ stages: - compile @@ -55,7 +60,6 @@ jobs: script: - ci/install-verilator.sh - ci/install-fesvr.sh - - export VERILATOR_ROOT=$TRAVIS_BUILD_DIR/tmp/verilator-3.918/ - ci/build-riscv-tests.sh - make run-asm-tests-verilator verilator=$TRAVIS_BUILD_DIR/tmp/bin/verilator diff --git a/ci/build-riscv-tests.sh b/ci/build-riscv-tests.sh index de65977c9..5b88a82ba 100755 --- a/ci/build-riscv-tests.sh +++ b/ci/build-riscv-tests.sh @@ -16,8 +16,12 @@ make install cd isa # generate hex files -for f in $(ls | grep -v '\.[dump|hex]'); do - # elf2hex $f - echo "elf2hex $f > $f.hex" - elf2hex 8 16384 $f 2147483648 > $f.hex -done +if [ $(command -v elf2hex) > /dev/null ]; then + for f in $(ls | grep -v '\.[dump|hex]'); do + # elf2hex $f + echo "elf2hex $f > $f.hex" + elf2hex 8 16384 $f 2147483648 > $f.hex + done +else + echo "Skipping hex file generation" +fi