The buildbot is up, put in hacks to enable debug and print out hostname.

[nmh] / docs / contrib / build_nmh

diff --git a/docs/contrib/build_nmh b/docs/contrib/build_nmh
index f0b0c56cde724cf8ab5463845877092bf9252b6c..adc6e1cb185c97cf1caf7822777094845bd408f6 100755 (executable)
--- a/docs/contrib/build_nmh
+++ b/docs/contrib/build_nmh
@@ -149,11 +149,11 @@ if install-mh -check >/dev/null 2>&1; then
     fi
   fi
 
     fi
   fi
 

-  if $ldd "$mhbin/inc" | grep sasl >/dev/null; then
+  if $ldd "`$mhbin/mhparam libdir`/post" | grep sasl >/dev/null; then

     config_sasl=y
   fi
 
     config_sasl=y
   fi
 

-  if $ldd "$mhbin/inc" | grep ssl >/dev/null; then
+  if $ldd "`$mhbin/mhparam libdir`/post" | grep ssl >/dev/null; then

     config_tls=y
   fi
 fi
     config_tls=y
   fi
 fi


@@ -273,17 +273,19 @@ if [ $status -eq 0 ]; then
    fi
 
     [ $verbose -ge 1 ]  &&  echo testing . . .
    fi
 
     [ $verbose -ge 1 ]  &&  echo testing . . .

-    checkoutput=`make $check 2>>"$logfile"`
+    checkoutput=`make $check AM_COLOR_TESTS=always 2>>"$logfile"`

     status=$?
 
     tests_summary=`echo "$checkoutput" | grep tests`
     #### If multiple tests not run, that line will be caught by the
     #### "grep tests" above.
     test_not_run=`echo "$checkoutput" | grep 'test was not run'`
     status=$?
 
     tests_summary=`echo "$checkoutput" | grep tests`
     #### If multiple tests not run, that line will be caught by the
     #### "grep tests" above.
     test_not_run=`echo "$checkoutput" | grep 'test was not run'`

+    fails=`echo "$checkoutput" | grep FAIL`

     if [ "$tests_summary" ]; then
       echo '===================' >>"$logfile"
     if [ "$tests_summary" ]; then
       echo '===================' >>"$logfile"

-      echo "$tests_summary" >>"$logfile"

       [ "$test_not_run" ]  &&  echo "$test_not_run" >>"$logfile"
       [ "$test_not_run" ]  &&  echo "$test_not_run" >>"$logfile"

+      [ "$fails" ]  &&  echo "$fails" >>"$logfile"
+      echo "$tests_summary" >>"$logfile"

       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \
         echo "$checkoutput" | tail -n 4 >>"$logfile"
       echo '===================' >>"$logfile"
       [ "$check" = distcheck ]  &&  \
         echo "$checkoutput" | tail -n 4 >>"$logfile"


@@ -305,12 +307,14 @@ if [ $status -eq 0 ]; then
   fi
 fi
 
   fi
 fi
 

-grep 'Error' "$logfile"
-grep 'warn' "$logfile"
-if [ $status -ne 0 ]; then
+grep Error "$logfile"
+grep warn "$logfile"
+
+if [ $status -eq 0 ]; then
+  [ $verbose -ge 1 ]  &&  echo build completed successfully
+else

   echo build failed!
   echo build log is in "$logfile"
 fi
   echo build failed!
   echo build log is in "$logfile"
 fi

-[ $status -eq 0  -a  $verbose -ge 1 ]  &&  echo build completed successfully

 
 exit $status
 
 exit $status