Change the nightly script to gather information about the run

and its environment.
Simplify z900.sendmail accordingly.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@12096

diff --git a/nightly/bin/nightly b/nightly/bin/nightly
index 7c956a6019ee968946c1023d2fcd701d2593f2a8..3ed1336284b7f7f984871eacd231e987f1b62f58 100755 (executable)
--- a/nightly/bin/nightly
+++ b/nightly/bin/nightly
@@ -178,8 +178,33 @@ done
 # Get times and date
 END=`date "+%F %H:%M:%S %Z"`
 
+# Gather some information about this run and its environment
+valgrind_revision="`svn info valgrind-new | grep Revision | sed 's/Revision[ ]*:[ ]*//'`"
+vex_revision="`svn info valgrind-new/VEX | grep Revision | sed 's/Revision[ ]*:[ ]*//'`"
+gcc_version="`gcc --version | head -1`"
+libc_so="`ls -1 /lib/libc.so.* | tail -1`"
+libc="unknown"
+if [ "x$libc_so" != "x" ]; then
+  if [ -e "$libc_so" -a -r "$libc_so" ]; then
+    libc="`/lib/libc.so.* | head -1`"
+  fi
+fi
+uname_stuff="`uname -mrs`"
+if [ -e "/etc/issue.net" -a -r "/etc/issue.net" ]; then
+  vendor_stuff="`cat /etc/issue.net | head -1`"
+else
+  vendor_stuff="unknown"
+fi
+
+echo "valgrind revision: $valgrind_revision" >  final
+echo "VEX revision:      $vex_revision"      >> final
+echo "GCC version:       $gcc_version"       >> final
+echo "C library:         $libc"              >> final
+echo "uname -mrs:        $uname_stuff"       >> final
+echo "Vendor version:    $vendor_stuff"      >> final
+
 # 'final' shows the difference between the old and new results
-echo                                               >  final
+echo                                              >> final
 echo "Nightly build on" $TAG "(" $ABT_DETAILS ")" >> final
 echo "Started at" $START                          >> final
 echo "Ended   at" $END                            >> final

diff --git a/nightly/conf/z900.sendmail b/nightly/conf/z900.sendmail
index 0d6c76b4cdf8aec7ca0f763ce7058c963fe37fae..9b88abebd504512af461d451e5d3bf96b0804a5f 100755 (executable)
--- a/nightly/conf/z900.sendmail
+++ b/nightly/conf/z900.sendmail
@@ -2,12 +2,6 @@ subject="$1"
 summary="$2"
 diffs="$3"
 
-valgrind_revision="`svn info valgrind-new | grep Revision | sed 's/Revision[ ]*:[ ]*//'`"
-vex_revision="`svn info valgrind-new/VEX | grep Revision | sed 's/Revision[ ]*:[ ]*//'`"
-gcc_version="`gcc --version | head -1`"
-glibc_version="`/lib/libc.so.* | head -1`"
-uname_stuff="`uname -mrs`"
-vendor_stuff="`cat /etc/issue.net | head -1`"
 MAILFILE=/opt/tobesent
 rm -f $MAILFILE
 touch $MAILFILE
@@ -15,14 +9,7 @@ echo "Subject: $subject" >> $MAILFILE
 echo "To: valgrind-developers@lists.sourceforge.net" >> $MAILFILE
 echo "Cc: britzel@acm.org" >> $MAILFILE
 echo "  " >> $MAILFILE
-echo "valgrind revision: $valgrind_revision" >> $MAILFILE
-echo "VEX revision:      $vex_revision"   >> $MAILFILE
-echo "GCC version:       $gcc_version"    >> $MAILFILE
-echo "GLIBC version:     $glibc_version"  >> $MAILFILE
-echo "uname -mrs:        $uname_stuff"    >> $MAILFILE
-echo "Vendor version:    $vendor_stuff"   >> $MAILFILE
-echo "  " >> $MAILFILE
 cat "$summary"  >> $MAILFILE
 echo "  " >> $MAILFILE
-# cat "$diffs"  >> $MAILFILE
+cat "$diffs"  >> $MAILFILE
 /usr/sbin/sendmail -t -i -fbritzel@acm.org < $MAILFILE