diff options
Diffstat (limited to 'usr/src/tools/scripts/nightly.sh')
| -rw-r--r-- | usr/src/tools/scripts/nightly.sh | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/usr/src/tools/scripts/nightly.sh b/usr/src/tools/scripts/nightly.sh index 9786f18d8a..2c52b89b28 100644 --- a/usr/src/tools/scripts/nightly.sh +++ b/usr/src/tools/scripts/nightly.sh @@ -21,7 +21,7 @@ # # -# Copyright 2008 Sun Microsystems, Inc. All rights reserved. +# Copyright 2009 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # Based on the nightly script from the integration folks, @@ -2928,7 +2928,6 @@ if [ "$r_FLAG" = "y" -a "$build_ok" = "y" ]; then echo "\n==== Check ELF runtime attributes ====\n" | \ tee -a $LOGFILE >> $mail_msg_file - LDDUSAGE="^ldd: does not support -e" LDDWRONG="wrong class" CRLERROR="^crle:" CRLECONF="^crle: configuration file:" @@ -2938,7 +2937,7 @@ if [ "$r_FLAG" = "y" -a "$build_ok" = "y" ]; then rm -f $RUNTIMEREF if [ -f $RUNTIMEOUT ]; then - egrep -v "$LDDUSAGE|$LDDWRONG|$CRLERROR|$CRLECONF" \ + egrep -v "$LDDWRONG|$CRLERROR|$CRLECONF" \ $RUNTIMEOUT > $RUNTIMEREF fi @@ -2949,20 +2948,13 @@ if [ "$r_FLAG" = "y" -a "$build_ok" = "y" ]; then else rtime_sflag="-s" fi - check_rtime -d $checkroot -i -m -o $rtime_sflag $checkroot 2>&1 | \ + check_rtime -d $checkroot -i -m -v -o $rtime_sflag $checkroot 2>&1 | \ egrep -v ": unreferenced object=$checkroot/.*/lib(w|intl|thread|pthread).so" | \ egrep -v ": unused object=$checkroot/.*/lib(w|intl|thread|pthread).so" | \ sort > $RUNTIMEOUT # Determine any processing errors that will affect the final output # and display these first. - grep -l "$LDDUSAGE" $RUNTIMEOUT > /dev/null - if (( $? == 0 )) ; then - echo "WARNING: ldd(1) does not support -e. The version of ldd(1)" | \ - tee -a $LOGFILE >> $mail_msg_file - echo "on your system is old - 4390308 (s81_30) is required.\n" | \ - tee -a $LOGFILE >> $mail_msg_file - fi grep -l "$LDDWRONG" $RUNTIMEOUT > /dev/null if (( $? == 0 )) ; then echo "WARNING: wrong class message detected. ldd(1) was unable" | \ @@ -2990,21 +2982,24 @@ if [ "$r_FLAG" = "y" -a "$build_ok" = "y" ]; then egrep '<dependency no longer necessary>' $RUNTIMEOUT | \ tee -a $LOGFILE >> $mail_msg_file - # NEEDED= and RPATH= are informational; report anything else that we + # NEEDED= and RPATH= are generated by the -i option + # VERDEF= and VERSION= are generated by the -v option. + # These lines are informational; report anything else that we # haven't already. - egrep -v "NEEDED=|RPATH=|$LDDUSAGE|$LDDWRONG|$CRLERROR|$CRLECONF" \ - $RUNTIMEOUT | tee -a $LOGFILE >> $mail_msg_file + egrep -v "NEEDED=|RPATH=|VERDEF=|VERSION=" $RUNTIMEOUT \ + | egrep -v "$LDDWRONG|$CRLERROR|$CRLECONF" \ + | tee -a $LOGFILE >> $mail_msg_file # probably should compare against a 'known ok runpaths' list if [ ! -f $RUNTIMEREF ]; then - egrep -v "$LDDUSAGE|$LDDWRONG|$CRLERROR|$CRLECONF" \ + egrep -v "$LDDWRONG|$CRLERROR|$CRLECONF" \ $RUNTIMEOUT > $RUNTIMEREF fi echo "\n==== Diff ELF runtime attributes (since last build) ====\n" \ >> $mail_msg_file - egrep -v "$LDDUSAGE|$LDDWRONG|$CRLERROR|$CRLECONF" $RUNTIMEOUT | \ + egrep -v "$LDDWRONG|$CRLERROR|$CRLECONF" $RUNTIMEOUT | \ diff $RUNTIMEREF - >> $mail_msg_file fi |