From 7826319e49f735168be65dcdb637b901b6c74b83 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Wed, 27 May 2020 04:05:44 -0400 Subject: [PATCH 1/3] Allow unset variables in travis_setup_env Signed-off-by: Schuyler Eldridge --- regression/run-test-bucket | 2 ++ 1 file changed, 2 insertions(+) diff --git a/regression/run-test-bucket b/regression/run-test-bucket index 8859fd23c29..5ed757cdcc0 100755 --- a/regression/run-test-bucket +++ b/regression/run-test-bucket @@ -28,7 +28,9 @@ if [[ ${TRAVIS:-false} == true ]]; then . "${regression_dir}/travis_setup_env.bash" . "${regression_dir}/travis_jigger.bash" . "${regression_dir}/travis_wait.bash" + set +u travis_setup_env + set -u else # If not running on Travis CI, Stub out the travis_wait to be a no-op, since # it's unnecessary and it has some undesirable side effects such as hiding From bb2ddb6bbcf03a4d4d51d4472ac4448c0ca71c5a Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Wed, 27 May 2020 12:59:28 -0400 Subject: [PATCH 2/3] Don't exit immediately for Travis regressions Disables immediate failure when running travis_wait methods. These tests need to keep going even if they fail to do things like print out the log. Signed-off-by: Schuyler Eldridge --- regression/travis_wait.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/regression/travis_wait.bash b/regression/travis_wait.bash index 371501bbdd3..7d8bca190fe 100644 --- a/regression/travis_wait.bash +++ b/regression/travis_wait.bash @@ -23,6 +23,7 @@ # https://github.com/travis-ci/travis-build/blob/73a5393263e0b135f49aceeb40ef6f0d827b9b11/lib/travis/build/bash/travis_wait.bash travis_wait() { + set +e local timeout="${1}" if [[ "${timeout}" =~ ^[0-9]+$ ]]; then @@ -56,5 +57,6 @@ travis_wait() { echo -e "\\n${ANSI_GREEN}Log:${ANSI_RESET}\\n" cat "${log_file}" + set -e return "${result}" } From e7fa8b96f0f53e7da2bb14eb5b5741fa92ec5900 Mon Sep 17 00:00:00 2001 From: Schuyler Eldridge Date: Wed, 27 May 2020 15:44:38 -0400 Subject: [PATCH 3/3] Remove +verbose from JTAG regressions Signed-off-by: Schuyler Eldridge --- regression/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/regression/Makefile b/regression/Makefile index 2f7eeb89e1a..7570903dcfc 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -277,7 +277,7 @@ ifdef SEED SEED_ARG = --seed $(SEED) endif -JTAG_DTM_SIM_ARGS = +verbose +jtag_rbb_enable=1 $(SEED_ARG) +JTAG_DTM_SIM_ARGS = +jtag_rbb_enable=1 $(SEED_ARG) stamps/%/vsim-jtag-dtm-32-$(JTAG_DTM_TEST).stamp: stamps/%/vsim$(JTAG_STAMP_SUFFIX).stamp stamps/riscv-tests.stamp RISCV=$(RISCV) PATH="$(abspath $(RISCV)/bin:$(PATH))" $(GDBSERVER) \