From 9bbecffbb880e7c9545b5d951bc2ade90ef1481f Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Mon, 20 Jul 2015 12:20:32 -0700 Subject: [PATCH 1/2] Have regression run "make" before "make run-asm-tests" I'm seeing some odd behavior where "make run-asm-tests" actually does nothing. This works around the issue. --- regression.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression.sh b/regression.sh index 9974023d..0844fcda 100755 --- a/regression.sh +++ b/regression.sh @@ -16,7 +16,7 @@ export RISCV="$(pwd)/install"; export PATH=$PATH:$RISCV/bin cd riscv-tools; ./build.sh; cd .. git submodule update --init git submodule status --recursive -cd emulator; make CONFIG=$1 run-asm-tests; cd .. +cd emulator; make CONFIG=$1; make CONFIG=$1 run-asm-tests; cd .. if [ $# -ge 2 ] then git clone git@github.com:ucb-bar/riscv-torture.git From d6b29ca9cc38cd30339b2b5b6f19bf4cbc20e44d Mon Sep 17 00:00:00 2001 From: Palmer Dabbelt Date: Mon, 20 Jul 2015 12:21:19 -0700 Subject: [PATCH 2/2] Run regression with bash's "-ex" mode This causes every command to be echo'd to stderr, and any failing command will fail the whole script. Without this the regression script will always pass. --- regression.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/regression.sh b/regression.sh index 0844fcda..0afbf37e 100755 --- a/regression.sh +++ b/regression.sh @@ -4,6 +4,8 @@ # Script to setup submodules, build rocket-chip, and run asm tests, and optionally run torture +set -ex + echo "Starting Rocket-chip regression test" if [ $# -lt 1 ] then