|
From: <sv...@va...> - 2011-10-04 16:58:25
|
Author: florian Date: 2011-10-04 17:53:34 +0100 (Tue, 04 Oct 2011) New Revision: 12096 Log: Change the nightly script to gather information about the run and its environment. Simplify z900.sendmail accordingly. Modified: trunk/nightly/bin/nightly trunk/nightly/conf/z900.sendmail Modified: trunk/nightly/bin/nightly =================================================================== --- trunk/nightly/bin/nightly 2011-10-04 16:28:42 UTC (rev 12095) +++ trunk/nightly/bin/nightly 2011-10-04 16:53:34 UTC (rev 12096) @@ -178,8 +178,33 @@ # 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 Modified: trunk/nightly/conf/z900.sendmail =================================================================== --- trunk/nightly/conf/z900.sendmail 2011-10-04 16:28:42 UTC (rev 12095) +++ trunk/nightly/conf/z900.sendmail 2011-10-04 16:53:34 UTC (rev 12096) @@ -2,12 +2,6 @@ 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 "To: val...@li..." >> $MAILFILE echo "Cc: br...@ac..." >> $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 -fb...@ac... < $MAILFILE |