Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Travis CI Shell Options #2490

Merged
merged 3 commits into from
May 28, 2020
Merged

Fix Travis CI Shell Options #2490

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7826319
Allow unset variables in travis_setup_env
seldridge May 27, 2020
bb2ddb6
Don't exit immediately for Travis regressions
seldridge May 27, 2020
e7fa8b9
Remove +verbose from JTAG regressions
seldridge May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion regression/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) \
Expand Down
2 changes: 2 additions & 0 deletions regression/run-test-bucket
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions regression/travis_wait.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -56,5 +57,6 @@ travis_wait() {
echo -e "\\n${ANSI_GREEN}Log:${ANSI_RESET}\\n"
cat "${log_file}"

set -e
return "${result}"
}