derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: Fix the nightly SST and SystemC tests

Browse Source 
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>
This commit is contained in:
Bobby R. Bruce
2023-03-06 15:36:24 -08:00
committed by Melissa Jost
parent 1ff3ea2a09
commit 5361da58be
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/nightly.sh
View File

@@ -159,10 +159,10 @@ build_and_run_SST () {
"${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 @@ build_and_run_systemc () {
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 @@ scons --with-cxx-config --without-python --without-tcmalloc USE_SYSTEMC=0 \
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 -; \
"
}