1.1 --- a/nbbuild/newbuild/build-nbi.sh Mon Jul 16 11:48:32 2012 +0200
1.2 +++ b/nbbuild/newbuild/build-nbi.sh Sat Aug 10 00:02:57 2013 +0200
1.3 @@ -60,6 +60,7 @@
1.4 ssh $NATIVE_MAC_MACHINE chmod a+x $MAC_PATH/installer/mac/newbuild/build.sh
1.5
1.6 ssh $NATIVE_MAC_MACHINE $MAC_PATH/installer/mac/newbuild/build.sh $MAC_PATH $BASENAME_PREFIX $BUILDNUMBER $ML_BUILD $BUILD_NBJDK7 $LOCALES > $MAC_LOG_NEW 2>&1 &
1.7 + REMOTE_MAC_PID=$!
1.8
1.9 fi
1.10
1.11 @@ -78,15 +79,17 @@
1.12 TAIL_PID=$!
1.13
1.14 set +x
1.15 - RUNNING_JOBS_COUNT=`jobs | wc -l | tr " " "\n" | grep -v '^$'`
1.16 + RUNNING_JOBS_COUNT=`ps --pid $REMOTE_MAC_PID | wc -l | tr " " "\n" | grep -v '^$'`
1.17 + echo "Entering loop with count of running jobs: " $RUNNING_JOBS_COUNT
1.18 #Wait for the end of native mac build
1.19 while [ $RUNNING_JOBS_COUNT -ge 2 ]; do
1.20 #1 or more jobs
1.21 sleep 10
1.22 - jobs > /dev/null
1.23 - RUNNING_JOBS_COUNT=`jobs | wc -l | tr " " "\n" | grep -v '^$'`
1.24 + RUNNING_JOBS_COUNT=`ps --pid $REMOTE_MAC_PID | wc -l | tr " " "\n" | grep -v '^$'`
1.25 + echo "----> count of running jobs: " $RUNNING_JOBS_COUNT
1.26 done
1.27 set -x
1.28 + echo "Will kill " $TAIL_PID
1.29 kill -s 9 $TAIL_PID
1.30 fi
1.31