gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[develop]: tests: Update nightly SystemC test

MJ
Melissa Jost (Gerrit)
Thu, Mar 30, 2023 9:01 PM

Melissa Jost has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/69337?usp=email )

Change subject: tests: Update nightly SystemC test
......................................................................

tests: Update nightly SystemC test

The SystemC test requires gem5 to be built with the minimum
dependencies image, and it was also updated to properly use
se.py since it has now been deprecated.

Change-Id: I1223afd70f105073d2cd4a2a78135f1f935c06ec
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69337
Reviewed-by: Bobby Bruce bbruce@ucdavis.edu
Maintainer: Bobby Bruce bbruce@ucdavis.edu
Tested-by: kokoro noreply+kokoro@google.com

M tests/nightly.sh
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/tests/nightly.sh b/tests/nightly.sh
index aa69c44..f5f9295 100755
--- a/tests/nightly.sh
+++ b/tests/nightly.sh
@@ -172,7 +172,7 @@
rm -rf "${gem5_root}/build/ARM"
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 "\
    
  •    gcr.io/gem5-test/ubuntu-22.04_min-dependencies:${tag} bash -c "\
    
    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
    @@ -183,7 +183,7 @@
    gcr.io/gem5-test/systemc-env:${tag} bash -c "
    cd util/systemc/gem5_within_systemc &&
    make -j${compile_threads} &&
    -../../../build/ARM/gem5.opt ../../../configs/example/se.py -c
    +../../../build/ARM/gem5.opt ../../../configs/deprecated/example/se.py -c
    ../../../tests/test-progs/hello/bin/arm/linux/hello &&
    LD_LIBRARY_PATH=../../../build/ARM/:/opt/systemc/lib-linux64/
    ./gem5.opt.sc m5out/config.ini && \

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/69337?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: I1223afd70f105073d2cd4a2a78135f1f935c06ec
Gerrit-Change-Number: 69337
Gerrit-PatchSet: 2
Gerrit-Owner: Melissa Jost melissakjost@gmail.com
Gerrit-Reviewer: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Melissa Jost mkjost@ucdavis.edu
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-MessageType: merged

Melissa Jost has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/69337?usp=email ) Change subject: tests: Update nightly SystemC test ...................................................................... tests: Update nightly SystemC test The SystemC test requires gem5 to be built with the minimum dependencies image, and it was also updated to properly use se.py since it has now been deprecated. Change-Id: I1223afd70f105073d2cd4a2a78135f1f935c06ec Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/69337 Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu> Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> --- M tests/nightly.sh 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Bobby Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/tests/nightly.sh b/tests/nightly.sh index aa69c44..f5f9295 100755 --- a/tests/nightly.sh +++ b/tests/nightly.sh @@ -172,7 +172,7 @@ rm -rf "${gem5_root}/build/ARM" 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 "\ + gcr.io/gem5-test/ubuntu-22.04_min-dependencies:${tag} bash -c "\ 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 \ @@ -183,7 +183,7 @@ gcr.io/gem5-test/systemc-env:${tag} bash -c "\ cd util/systemc/gem5_within_systemc && \ make -j${compile_threads} && \ -../../../build/ARM/gem5.opt ../../../configs/example/se.py -c \ +../../../build/ARM/gem5.opt ../../../configs/deprecated/example/se.py -c \ ../../../tests/test-progs/hello/bin/arm/linux/hello && \ LD_LIBRARY_PATH=../../../build/ARM/:/opt/systemc/lib-linux64/ \ ./gem5.opt.sc m5out/config.ini && \ -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/69337?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: I1223afd70f105073d2cd4a2a78135f1f935c06ec Gerrit-Change-Number: 69337 Gerrit-PatchSet: 2 Gerrit-Owner: Melissa Jost <melissakjost@gmail.com> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Melissa Jost <mkjost@ucdavis.edu> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-MessageType: merged