Deleted Added
full compact
7a8,18
> case "$SIMUL" in
> '') PARALLEL_BUILDS=1
> ;;
> *) PARALLEL_BUILDS=$SIMUL
> esac
>
> case "$PARALLEL_BUILDS" in
> 1) ;;
> *) echo Launching $PARALLEL_BUILDS parallel builds on each machine
> esac
>
9,10c20,22
< # beauregard freebsd-6
< # o churchy alpha-dec-osf5.1
---
> # barnstable freebsd-6.1
> # beauregard freebsd-6.0
> # X churchy alpha-dec-osf5.1
12c24
< # grundoon freebsd-6.1
---
> # grundoon freebsd-6.2
14,15c26,27
< # o macabre sparc-sun-solaris2.8
< # o mort sparc-sun-solaris2.8
---
> # o macabre freebsd-6.1-STABLE
> # o mort freebsd-6.1
25a38,39
> # HMS: we need $PWD because solaris produces /deacon/backroom when
> # we are in /backroom and in general there is no /deacon/backroom.
29d42
< echo $SIG > .buildkey
37,50c50,103
< echo $i
< case "1" in
< 0)
< ssh $i "cd $c_d ; ./build $SIG $PARSE $STD $BUILD_ARGS" &
< ssh $i "cd $c_d ; ./build $SIG $PARSE $STD --without-crypto $BUILD_ARGS" &
< ssh $i "cd $c_d ; ./build $SIG $STD --disable-all-clocks $BUILD_ARGS" &
< ;;
< 1) ssh $i "cd $c_d ; \
< ./build $SIG $PARSE $STD $BUILD_ARGS ; \
< ./build $SIG $PARSE $STD --disable-debugging $BUILD_ARGS ; \
< ./build $SIG $PARSE $STD --without-crypto $BUILD_ARGS ; \
< ./build $SIG $STD --disable-all-clocks $BUILD_ARGS" \
< &
< ;;
---
> SKIPTHIS=0
> [ -f .buildkey-$i ] && SKIPTHIS=1
> case "$SKIPTHIS" in
> 1)
> echo flock-build running on $i? check LIST, skipping
> ;;
> 0)
> echo $i
> echo $SIG > .buildkey-$i
> case "1" in
> 0)
> ssh $i "cd $c_d ; ./build $SIG $PARSE $STD $BUILD_ARGS" &
> ssh $i "cd $c_d ; ./build $SIG $PARSE $STD --without-crypto $BUILD_ARGS" &
> ssh $i "cd $c_d ; ./build $SIG $STD --disable-all-clocks $BUILD_ARGS" &
> ;;
> 1)
> cat > .flockbuild-$i-$SIG <<ENDQUOT
> #!/bin/sh
>
> # depends on job control and expects to be invoked under ssh -tt
>
> cd $c_d
> COUNT=0
>
> ./build $SIG $PARSE $STD $BUILD_ARGS &
>
> COUNT=\`expr \$COUNT + 1\`
> echo $i started build \$COUNT of 4
> [ 0 -lt \`expr \$COUNT % $PARALLEL_BUILDS\` ] || wait
>
> ./build $SIG $PARSE $STD --disable-debugging $BUILD_ARGS &
>
> COUNT=\`expr \$COUNT + 1\`
> echo $i started build \$COUNT of 4
> [ 0 -lt \`expr \$COUNT % $PARALLEL_BUILDS\` ] || wait
>
> ./build $SIG $PARSE $STD --without-crypto $BUILD_ARGS &
>
> COUNT=\`expr \$COUNT + 1\`
> echo $i started build \$COUNT of 4
> [ 0 -lt \`expr \$COUNT % $PARALLEL_BUILDS\` ] || wait
>
> ./build $SIG $STD --disable-all-clocks $BUILD_ARGS &
>
> COUNT=\`expr \$COUNT + 1\`
> echo $i started build \$COUNT of 4
> wait
> echo \`date -u '+%H:%M:%S'\` $i flock-build $c_d done.
> rm .buildkey-$i
> ENDQUOT
> chmod +x .flockbuild-$i-$SIG
> ssh -tt $i "$c_d/.flockbuild-$i-$SIG ; \
> rm $c_d/.flockbuild-$i-$SIG" 2>/dev/null &
> esac
52a106
> echo `date -u '+%H:%M:%S'` flock-build launched