Jason Lowe-Power has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/17456
Change subject: tests: Update jenkins presubmit
......................................................................
tests: Update jenkins presubmit
Change-Id: Ifcff88c8c4c75a9f630b97eaca22edd1681529c3
Signed-off-by: Jason Lowe-Power <[email protected]>
---
M tests/jenkins/presubmit.sh
1 file changed, 6 insertions(+), 60 deletions(-)
diff --git a/tests/jenkins/presubmit.sh b/tests/jenkins/presubmit.sh
index f00f396..02833bd 100755
--- a/tests/jenkins/presubmit.sh
+++ b/tests/jenkins/presubmit.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# Copyright (c) 2016 ARM Limited
+# Copyright (c) 2018 The Regents of the University of California
# All rights reserved
#
# The license below extends only to copyright in the software and shall
@@ -35,69 +35,15 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# Authors: Andreas Sandberg
-# Sean Wilson
+# Authors: Jason Lowe-Power
set -e
# Use ccache with the default directory for caching
export PATH="/usr/lib/ccache:$PATH"
-cd git/jenkins-gem5-prod
+cd git/jenkins-gem5-prod/tests
-BUILD_JOBS=4
-
-GEM5_ARCH="ARM NULL X86"
-GEM5_VARIANT="opt"
-
-TARGETS=
-for A in ${GEM5_ARCH}; do
- TARGETS+=" build/${A}/gem5.${GEM5_VARIANT}"
-done
-
-export TEST_TARGETS=""
-for A in ${GEM5_ARCH}; do
- TEST_TARGETS+=" build/${A}/tests/${GEM5_VARIANT}/quick/se/00.hello"
-done
-
-runtests () {
- # Set pipefail incase scons test fails out while reading.
- set -e
- set -o pipefail
-
- # Build the gem5 binaries.
- scons --ignore-style ${TARGETS} -j${BUILD_JOBS}
-
- # Keep pushing out SCons output and check the fail status after we
have read
- # through all of the tests.
- scons --ignore-style ${TEST_TARGETS} -j${BUILD_JOBS} |\
- {
- FAILED=""
- while read line; do
- echo "${line}"
- failed_lines="$(echo "${line}" | grep "FAILED!"; true)"
- if ! [ "${failed_lines}" = "" ]; then
- FAILED="fail"
- fi
- done
- test "${FAILED}" = ""
- }
-
- exit 0
- }
-
- # Print out the output as it comes to us, but don't exit right away
- # if runtests fails, we want to print the final status on our own.
- runtests | {
- while read line; do
- echo "${line}"
- done
-}
-
-if [ "${PIPESTATUS[0]}" = "0" ]; then
- echo "SUCCESS"
- exit 0
-else
- echo "FAIL"
- exit 1
-fi
+# Build with 4 threads (i.e., pass -j4 to scons)
+# Run 4 tests in parallel
+./main.py run -j4 -t4
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/17456
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: Ifcff88c8c4c75a9f630b97eaca22edd1681529c3
Gerrit-Change-Number: 17456
Gerrit-PatchSet: 1
Gerrit-Owner: Jason Lowe-Power <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
