From 35b7c9a0547de1e82accc7fc50491a1f61cf3557 Mon Sep 17 00:00:00 2001 From: Anton Blanchard Date: Sat, 8 Feb 2020 23:14:13 +1100 Subject: [PATCH] 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 --- .travis.yml | 2 +- scripts/run_test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41cc3e8..f681303 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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" diff --git a/scripts/run_test.sh b/scripts/run_test.sh index c49f309..cf92150 100755 --- a/scripts/run_test.sh +++ b/scripts/run_test.sh @@ -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 ********"