1
0
mirror of https://github.com/antonblanchard/chiselwatt.git synced 2026-01-13 07:20:14 +00:00

Fix make check and Travis CI

We weren't propagating all errors back to Travis CI, so make check wasn't
actually being tested.

Signed-off-by: Anton Blanchard <anton@linux.ibm.com>
This commit is contained in:
Anton Blanchard 2020-02-08 23:14:13 +11:00 committed by Anton Blanchard
parent d575c18cfb
commit 35b7c9a054
2 changed files with 2 additions and 2 deletions

View File

@ -6,4 +6,4 @@ services: docker
before_install: docker pull verilator/verilator:latest
script:
docker run --rm -t -v `pwd`:/build -w /build --entrypoint /bin/bash verilator/verilator:latest -c "apt update; apt install -y default-jre-headless gnupg python3-pexpect; apt update; echo 'deb https://dl.bintray.com/sbt/debian /' | tee -a /etc/apt/sources.list.d/sbt.list; apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823; apt update; apt install -y sbt; make; make check; ./scripts/test_micropython_long.py"
docker run --rm -t -v `pwd`:/build -w /build --entrypoint /bin/bash verilator/verilator:latest -c "apt update && apt install -y default-jre-headless gnupg python3-pexpect && apt update && echo 'deb https://dl.bintray.com/sbt/debian /' | tee -a /etc/apt/sources.list.d/sbt.list && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823 && apt update && apt install -y sbt && make && make check && ./scripts/test_micropython_long.py"

View File

@ -25,7 +25,7 @@ ${CHISELWATT_DIR}/chiselwatt 2> test.err | grep -v "^$" | grep -v GPR31 > test.o
grep -v "^$" ${CHISELWATT_DIR}/tests/${TEST}.out | grep -v GPR31 | grep -v XER > exp.out
diff -q test.out exp.out && echo "$TEST PASS" && exit 0
diff --strip-trailing-cr -q test.out exp.out && echo "$TEST PASS" && exit 0
cat test.err
echo "$TEST FAIL ********"