[svn-r3656] Purpose:

    adjustment
Description:
    When gondolin failed the 1.5 test, it moved ahead for the 1.4 test.
    The 1.5 test usually takes 1 hour to complete but runtest only waited
    30 minutes for the 1.4 cvs update to complete.  So, gondolin ended
    up failing the 1.4 test too.
Solution:
    Changed the wait time to 90 minutes.
    Added echo statements showing it is waiting for some event. This
    would help the human knowing it is waiting for something.
    Added more comments about the algorithm of the waiting.
Platforms tested:
    Gotta be right. :-)

1 files changed, 7 insertions, 2 deletions

diff --git a/bin/runtest b/bin/runtest
index d77ffa3..35ec892 100755
--- a/bin/runtest
+++ b/bin/runtest
@@ -207,6 +207,7 @@ WAITFOR()
     fi
     while [ ! -f $wait_file ]; do
 	if [ $nminutes -gt 0 ]; then
+	    echo "Wait For $wait_file to appear"
 	    sleep 60			#sleep 1 minute
 	else
 	    WAIT_STATUS=1
@@ -239,6 +240,7 @@ WAITTILL()
     fi
     while [ -f $wait_file ]; do
 	if [ $nminutes -gt 0 ]; then
+	    echo "Wait till $wait_file has disappeared"
 	    sleep 60			#sleep 1 minute
 	else
 	    WAIT_STATUS=1
@@ -518,8 +520,11 @@ if [ -z "$NOCVS" -a ! -f $CVSLOG ]; then
     fi
     PRINT_BLANK
 else
-    # make sure the cvs update, if done by another host, has completed
-    WAITFOR $CVSLOG 30
+    # make sure the cvs update, if done by another host, has completed.
+    # First wait for the presence of $CVSLOG which signals some host
+    # has started the cvs update.  Then wait for the absense of $CVSLOG_LOCK
+    # which signals the host has completed the cvs update.
+    WAITFOR $CVSLOG 90
     if [ $WAIT_STATUS -ne 0 ]; then
 	errcode=$WAIT_STATUS
 	REPORT_ERR "****Time expired waiting CVS update to start****"