From: thierry <thierry@41d37cc5-eb28-0410-a9bf-d37491348ade>
Date: Wed, 4 Jul 2007 14:15:40 +0000 (+0000)
Subject: attempts to remove output for cron
X-Git-Tag: foo~443
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=54dec49698b839a1b8d877610c84a95acbb2121c;p=infrastructure.git

attempts to remove output for cron
---

diff --git a/scripts/nightly-build.sh b/scripts/nightly-build.sh
index 9715a1b..442f6e4 100755
--- a/scripts/nightly-build.sh
+++ b/scripts/nightly-build.sh
@@ -95,6 +95,9 @@ function build () {
     echo "Running make IN build $(pwd)"
     make stage1=true ${MAKEOPTS[@]} TAGSFILE=${TAGSFILE} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
     make ${MAKEOPTS[@]} TAGSFILE=${TAGSFILE} PLDISTRO=${DISTRO} ${MAKEVARS[@]} -C $BASE $MAKETARGETS
+
+    # restore silent mode - otherwise cron gets it
+    set +x
 }
 
 function runtest () {
@@ -124,6 +127,8 @@ function runtest () {
     if [ "$?" != 0 ] ; then
 	failure
     fi
+
+    set +x
 }
 
 function show_env () {
@@ -204,11 +209,11 @@ function main () {
 	
 	if [ -n "$DO_BUILD" ] ; then 
 	    build >> ${BUILD}/log-build.txt 2>&1 
+	    touch ${BUILD}.build-ok
 	fi
 	
 	if [ -n "$DO_TEST" ] ; then 
 	    runtest ${BUILD} >> ${BUILD}/log-build.txt 2>&1 
-	    touch ${BUILD}.build-ok
 	fi
 	
 	success >> ${BUILD}/log-build.txt 2>&1