Fix logging

jordancarlin · Jul 23, 2024 · df87601 · df87601
1 parent 6dca49a
commit df87601
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/bin/wally-tool-chain-install.sh b/bin/wally-tool-chain-install.sh
@@ -67,7 +67,7 @@ git_check() {
     fi
 }
 
-set -ex # break on error
+set -exo pipefail # break on error
 trap error ERR # run error handler on error
 STATUS="setup" # keep track of what part of the installation is running for error messages
 
@@ -210,7 +210,7 @@ if git_check "riscv-gnu-toolchain" "https://github.com/riscv/riscv-gnu-toolchain
     git reset --hard && git clean -f && git checkout master && git pull
     git pull
     ./configure --prefix="${RISCV}" --with-multilib-generator="rv32e-ilp32e--;rv32i-ilp32--;rv32im-ilp32--;rv32iac-ilp32--;rv32imac-ilp32--;rv32imafc-ilp32f--;rv32imafdc-ilp32d--;rv64i-lp64--;rv64ic-lp64--;rv64iac-lp64--;rv64imac-lp64--;rv64imafdc-lp64d--;rv64im-lp64--;"
-    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/riscv-gnu-toolchain.log | grep -iE "(warning|error|fail|success|stamp)"
+    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/riscv-gnu-toolchain.log | (grep -iE "(warning|error|fail|success|stamp)" || true)
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf riscv-gnu-toolchain
@@ -259,8 +259,8 @@ if git_check "qemu" "https://github.com/qemu/qemu" "$RISCV/include/qemu-plugin.h
     git reset --hard && git clean -f && git checkout master && git pull --recurse-submodules -j ${NUM_THREADS}
     git submodule update --init --recursive
     ./configure --target-list=riscv64-softmmu --prefix="$RISCV"
-    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/qemu.log | grep -iE "(warning|error|fail|success)"
-    make install 2>&1 | tee -a "$RISCV"/logs/qemu.log | grep -iE "(warning|error|fail|success)"
+    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/qemu.log | (grep -iE "(warning|error|fail|success)" || true)
+    make install 2>&1 | tee -a "$RISCV"/logs/qemu.log | (grep -iE "(warning|error|fail|success)" || true)
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf qemu
@@ -282,8 +282,8 @@ if git_check "riscv-isa-sim" "https://github.com/riscv-software-src/riscv-isa-si
     mkdir -p build
     cd build
     ../configure --prefix="$RISCV"
-    make -j ${NUM_THREADS} #2>&1 | tee "$RISCV"/logs/spike.log | grep -iE "(warning|error|fail|success)"
-    make install #2>&1 | tee -a "$RISCV"/logs/spike.log | grep -iE "(warning|error|fail|success)"
+    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/spike.log | (grep -iE "(warning|error|fail|success)" || true)
+    make install 2>&1 | tee -a "$RISCV"/logs/spike.log | (grep -iE "(warning|error|fail|success)" || true)
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf riscv-isa-sim
@@ -307,8 +307,8 @@ if git_check "verilator" "https://github.com/verilator/verilator" "$RISCV/share/
     git reset --hard && git clean -f && git checkout master && git pull
     autoconf
     ./configure --prefix="$RISCV"
-    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/verilator.log | grep -iE "(warning|error|fail|success)"
-    make install 2>&1 | tee -a "$RISCV"/logs/verilator.log | grep -iE "(warning|error|fail|success)"
+    make -j ${NUM_THREADS} 2>&1 | tee "$RISCV"/logs/verilator.log | (grep -iE "(warning|error|fail|success)" || true)
+    make install 2>&1 | tee -a "$RISCV"/logs/verilator.log | (grep -iE "(warning|error|fail|success)" || true)
     if [ "$clean" ]; then
         cd "$RISCV"
         rm -rf verilator
@@ -362,8 +362,8 @@ if git_check "sail-riscv" "https://github.com/riscv/sail-riscv.git" "$RISCV/bin/
     cd sail-riscv
     git reset --hard && git clean -f && git checkout master && git pull
     export OPAMCLI=2.0  # Sail is not compatible with opam 2.1 as of 4/16/24
-    ARCH=RV64 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV64  2>&1 | tee "$RISCV"/logs/sail_model.log | grep -iE "(warning|error|fail|success)"
-    ARCH=RV32 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV32 2>&1 | tee -a "$RISCV"/logs/sail_model.log | grep -iE "(warning|error|fail|success)"
+    ARCH=RV64 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV64  2>&1 | tee "$RISCV"/logs/sail_model.log | (grep -iE "(warning|error|fail|success)" || true)
+    ARCH=RV32 make -j ${NUM_THREADS} c_emulator/riscv_sim_RV32 2>&1 | tee -a "$RISCV"/logs/sail_model.log | (grep -iE "(warning|error|fail|success)" || true)
     cp -f c_emulator/riscv_sim_RV64 "$RISCV"/bin/riscv_sim_RV64
     cp -f c_emulator/riscv_sim_RV32 "$RISCV"/bin/riscv_sim_RV32
     if [ "$clean" ]; then