From 86d0b033168251e3b7cef70a625faa63774def7c Mon Sep 17 00:00:00 2001 From: Giacomo Tesio Date: Thu, 18 May 2017 19:11:33 +0200 Subject: [PATCH] travis-ci: fix dotters --- cross/init.sh | 6 ++++-- cross/pkgs/newlib.sh | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cross/init.sh b/cross/init.sh index c3afa94..88834b4 100755 --- a/cross/init.sh +++ b/cross/init.sh @@ -32,7 +32,7 @@ usyscalls header $JEHANNE/sys/src/sysconf.json > $JEHANNE/arch/amd64/include/sys # create a GCC crosscompiler in Debian without requiring root access or Tex. # And this despite the extreme quality of Debian GNU/Linux! -echo -n Building cross toolchain. +echo -n please wait. ( # Inside parentheses, and therefore a subshell . . . while [ 1 ] # Endless loop. @@ -54,6 +54,9 @@ function failOnError { # $1 -> exit status on a previous command # $2 -> task description if [ $1 -ne 0 ]; then + kill $dotter + wait $dotter 2>/dev/null + echo "ERROR $2" echo echo BUILD LOG: @@ -211,4 +214,3 @@ ln -sf /bin/bash $JEHANNE/hacking/cross/toolchain/bin/x86_64-jehanne-sh kill $dotter wait $dotter 2>/dev/null - diff --git a/cross/pkgs/newlib.sh b/cross/pkgs/newlib.sh index a1aeeca..32e58bf 100755 --- a/cross/pkgs/newlib.sh +++ b/cross/pkgs/newlib.sh @@ -45,9 +45,10 @@ dotter=$! function failOnError { # $1 -> exit status on a previous command # $2 -> task description - kill $dotter - wait $dotter 2>/dev/null if [ $1 -ne 0 ]; then + kill $dotter + wait $dotter 2>/dev/null + echo "ERROR $2" if [ "$TRAVIS_BUILD_DIR" != "" ]; then echo