Melissa Jost has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/68677?usp=email ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: tests: Fix the nightly SST and SystemC tests ...................................................................... tests: Fix the nightly SST and SystemC tests These tests were only returning the exit-code of the last command in the bash script, which would silence failures in commands prior to that. This patch fixes this. Now these tests will return a non-zero exit code for any failure when executing these bash scripts. Change-Id: I2195bbd0357f0b38c192ab5f9e8ad68101786247 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/68677 Reviewed-by: Jason Lowe-Power <power.jg@gmail.com> Maintainer: Jason Lowe-Power <power.jg@gmail.com> Tested-by: kokoro <noreply+kokoro@google.com> --- M tests/nightly.sh 1 file changed, 9 insertions(+), 9 deletions(-) Approvals: Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/tests/nightly.sh b/tests/nightly.sh index 1360c44..aa69c44 100755 --- a/tests/nightly.sh +++ b/tests/nightly.sh @@ -159,10 +159,10 @@ "${gem5_root}" --rm --memory="${docker_mem_limit}" \ gcr.io/gem5-test/sst-env:${tag} bash -c "\ scons build/${isa}/libgem5_${variant}.so -j${compile_threads} \ ---without-tcmalloc --ignore-style; \ -cd ext/sst; \ -make clean; make -j ${compile_threads}; \ -sst --add-lib-path=./ sst/example.py; \ +--without-tcmalloc --ignore-style && \ +cd ext/sst && \ +make clean; make -j ${compile_threads} && \ +sst --add-lib-path=./ sst/example.py && \ cd -; " } @@ -173,7 +173,7 @@ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ "${gem5_root}" --memory="${docker_mem_limit}" --rm \ gcr.io/gem5-test/ubuntu-22.04_all-dependencies:${tag} bash -c "\ -scons -j${compile_threads} --ignore-style build/ARM/gem5.opt; \ +scons -j${compile_threads} --ignore-style build/ARM/gem5.opt && \ scons --with-cxx-config --without-python --without-tcmalloc USE_SYSTEMC=0 \ -j${compile_threads} build/ARM/libgem5_opt.so \ " @@ -181,12 +181,12 @@ docker run -u $UID:$GID --volume "${gem5_root}":"${gem5_root}" -w \ "${gem5_root}" --memory="${docker_mem_limit}" --rm \ gcr.io/gem5-test/systemc-env:${tag} bash -c "\ -cd util/systemc/gem5_within_systemc; \ -make -j${compile_threads}; \ +cd util/systemc/gem5_within_systemc && \ +make -j${compile_threads} && \ ../../../build/ARM/gem5.opt ../../../configs/example/se.py -c \ - ../../../tests/test-progs/hello/bin/arm/linux/hello; \ + ../../../tests/test-progs/hello/bin/arm/linux/hello && \ LD_LIBRARY_PATH=../../../build/ARM/:/opt/systemc/lib-linux64/ \ - ./gem5.opt.sc m5out/config.ini; \ + ./gem5.opt.sc m5out/config.ini && \ cd -; \ " } -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/68677?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: I2195bbd0357f0b38c192ab5f9e8ad68101786247 Gerrit-Change-Number: 68677 Gerrit-PatchSet: 3 Gerrit-Owner: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Jason Lowe-Power <power.jg@gmail.com> Gerrit-Reviewer: Melissa Jost <mkjost@ucdavis.edu> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged