From 710c885b9c4ff4d430d67ffd6631ba310dd6c3e0 Mon Sep 17 00:00:00 2001 From: Charlie Somerville Date: Fri, 30 Aug 2013 17:00:29 +1000 Subject: [PATCH 1/3] only print output of configure, etc. if they fail --- script/cibuild | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/script/cibuild b/script/cibuild index 9941aa32076e87..10f49da63192b7 100755 --- a/script/cibuild +++ b/script/cibuild @@ -4,9 +4,16 @@ if [ -z "$CORES" ]; then CORES=16 fi -git clean -f -x -autoconf -./configure --disable-install-doc --prefix=`pwd`/inst +function Q { + if ! "$@" > /tmp/ruby_ci_log; then + cat /tmp/ruby_ci_log + exit 1 + fi +} + +Q git clean -f -x +Q autoconf +Q ./configure --disable-install-doc --prefix=`pwd`/inst make -j $CORES make install make TESTS="-j $CORES" test-all From 3c7e56a2bc4ffc0b72eb0120a01b06583177b79c Mon Sep 17 00:00:00 2001 From: Charlie Somerville Date: Fri, 30 Aug 2013 17:05:13 +1000 Subject: [PATCH 2/3] silence make and make install too --- script/cibuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/cibuild b/script/cibuild index 10f49da63192b7..ac10b49899f774 100755 --- a/script/cibuild +++ b/script/cibuild @@ -14,6 +14,6 @@ function Q { Q git clean -f -x Q autoconf Q ./configure --disable-install-doc --prefix=`pwd`/inst -make -j $CORES -make install +Q make -j $CORES +Q make install make TESTS="-j $CORES" test-all From e26a92681086288f779b198579eabb5ab9210e9a Mon Sep 17 00:00:00 2001 From: Charlie Somerville Date: Fri, 30 Aug 2013 17:08:18 +1000 Subject: [PATCH 3/3] send stderr to the log too --- script/cibuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/cibuild b/script/cibuild index ac10b49899f774..9822541911c516 100755 --- a/script/cibuild +++ b/script/cibuild @@ -5,7 +5,7 @@ if [ -z "$CORES" ]; then fi function Q { - if ! "$@" > /tmp/ruby_ci_log; then + if ! "$@" &> /tmp/ruby_ci_log; then cat /tmp/ruby_ci_log exit 1 fi