diff --git a/security/nss/tests/header b/security/nss/tests/header index b2896d266c8..d8d36741733 100644 --- a/security/nss/tests/header +++ b/security/nss/tests/header @@ -29,6 +29,8 @@ # as would have been produced with -cron # -m - send filename to mailinglist (csl) only useful # with -f +# -ml - send link to filename to mailinglist (csl) +# only useful with -f # -cron equivalient to -y -s -d -f $RESULTDIR/$HOST. # -t run on a tinderbox build that means: local, from the startlocation # -l run on a local build mozroot @@ -68,7 +70,9 @@ fi export QASCRIPT_DIR O_HWACC=OFF -O_ALWAYS_YES=OFF # turned on by -y answer all questions with y +if [ -z "$O_ALWAYS_YES" ] ; then + O_ALWAYS_YES=OFF # turned on by -y answer all questions with y +fi if [ -z "$O_INIT" ] # header is global, some including scripts may not then # want the init to run, the others don't need to bother @@ -78,18 +82,21 @@ if [ -z "$O_PARAM" ] # header is global, some including scripts may not then # require parameters, the others don't need to bother O_PARAM=ON fi -if [ -z "$O_OPTIONS" ] # header is global, some including scripts may not +if [ -z "$O_OPTIONS" ] # header is global, some including scripts may not then # permit options, they don't need to bother O_OPTIONS=OFF fi O_SILENT=OFF # turned on by -s silent (only usefull with -y) -O_DEBUG=OFF # turned on by -d - calls to Debug produce output when ON +if [ -z "$O_DEBUG" ] ; then + O_DEBUG=OFF # turned on by -d - calls to Debug produce output when ON +fi O_FILE=OFF # turned on by -f echo all output to a file $FILENAME O_CRON=OFF # turned on by -cron cron use only O_CRONFILE=OFF # turned on by -cron cron and -fcron O_LOCAL=OFF # turned on by -l* run on a local build in $LOCAL_MOZROOT O_LN=OFF # turned on by -ln and -lt, test a networkbuild locally O_MAIL=OFF # turned on by -m - sends email +O_MAIL_LINK=OFF # turned on by -ml - sends email O_TBX=OFF # turned on by -t run on a tinderbox build # that means: local, from the startlocation @@ -176,12 +183,9 @@ fi if [ -z "$BC_MASTER" ] # master directory for backwardscompatibility testing then # a linux compiler bug prevents us from doing the # testing against a rtm - so we rebuild the branch - BC_MASTER=nss322/builds/20010820.1/y2sun2_Solaris8 - #if [ "`uname -sp`" != "SunOS i386" ] ; then - #BC_MASTER="nss32/builds/20010510.1-nss-3.2-ref" - #else - #BC_MASTER="nss32/builds/20010530.1.nss321_rtm_solaris" - #fi + BC_UX_MASTER=nss322/builds/20010820.1/y2sun2_Solaris8 + BC_NT_MASTER=nss322/builds/20010820.1/blowfish_NT4.0_Win95 + BC_MASTER=$BC_UX_MASTER fi BC_RELEASE=3.2 export BC_RELEASE @@ -208,6 +212,7 @@ glob_init() win_set_tmp write_to_tmpfile MASTERBUILD=$NT_MASTERBUILD + BC_MASTER=$BC_NT_MASTER fi umask 0 init_dirs @@ -722,7 +727,17 @@ eval_opts() O_DEBUG=ON #set -x ;; - -m*|-M*) + -ml|-ML) + O_MAIL_LINK=ON + shift + MAILINGLIST=$1 + if [ -z "$MAILINGLIST" ] + then + glob_usage "Error: -m requires a mailinglist to follow, for example sonmi,wtc,nelsonb " + fi + Debug "Sending link to result to $MAILINGLIST" + ;; + -m|-M) O_MAIL=ON shift MAILINGLIST=$1 @@ -878,6 +893,10 @@ set_host() } init_host() { + if [ `basename $0` != nssqa ] ; then + return + fi + init_host_done=0 if [ $DS_WAS_SET = FALSE ] #give chance to overwrite, espec. for NT @@ -1185,7 +1204,23 @@ Exit() then kill_by_name selfserv fi - if [ $O_MAIL = "ON" -a $O_FILE = "ON" ] + if [ $O_MAIL_LINK = "ON" -a $O_FILE = "ON" ] + then + if [ $EARLY_EXIT = TRUE ] #before the report file has been created + then + early_exit "$1" + else + head -3 $FILENAME >$ML_FILE + echo "Content-Type: text/plain; charset=us-ascii; format=flowed + Content-Transfer-Encoding: 7bit + +" >>$ML_FILE + echo $HREF_TMP_HTML_FILE >>$ML_FILE + cat $ML_FILE | $RMAIL $MAILINGLIST + fi + +#FIXME - early exit etc + elif [ $O_MAIL = "ON" -a $O_FILE = "ON" ] then if [ $EARLY_EXIT = TRUE ] #before the report file has been created then @@ -1427,6 +1462,8 @@ opt_usage() Echo " as would have been produced with -cron" Echo " -m - send filename to mailinglist (csl " Echo " example sonmi,nelsonb,wtc) only useful with -f" + Echo " -ml - send link to filename to mailinglist " + Echo " (csl example sonmi,nelsonb,wtc) only useful with -f" Echo " -cron equivalient to -y -s -d -f \$RESULTDIR/\$HOST.nssqa" Echo " -t run on a tinderbox build (included -cron)" if [ `basename $0` = nssqa ] ; then diff --git a/security/nss/tests/qa_stat b/security/nss/tests/qa_stat index ac8c65f90df..693a1ca267c 100755 --- a/security/nss/tests/qa_stat +++ b/security/nss/tests/qa_stat @@ -189,10 +189,11 @@ qa_stat_init() BCMISSINGLIST=${RFILE}.BCM BCERRORLIST=${RFILE}.BCE TMPFILE=${RFILE}.T + ML_FILE=${RFILE}.ML TMPFILES="$TMPFILES $TMPFILE" TMPFILES="$TMPFILES $ERRORLIST $PLATFORMLIST $PERFLIST $WARNINGLIST \ - $BCMISSINGLIST $BCERRORLIST" #FIXME uncomment + $BCMISSINGLIST $BCERRORLIST $ML_FILE" #FIXME uncomment FILENAME=$RFILE #we might want to mail it...later switch to html file O_FILE="ON" @@ -231,6 +232,15 @@ etscape]">
  +
  +

+Tinderbox
+Tinderbox +QA result

+  +  
 
@@ -648,6 +658,93 @@ CURRENT_TABLE="BC" #so html_line can determine which fields to write echo 'QA time / #' echo '' + for w in `ls */results.html` + do + TMP_RESULT="`dirname $w`/results.tmp" + TMP_BC_RESULT="`dirname bct/$w`/results.tmp" + rm $TMP_RESULT $TMP_BC_RESULT 2>/dev/null + cat $w | sed -e 's/<[^>]*>//g' -e 's/ /_/g' \ + -e 's/signtool_-[vw]/signtool_-vw/' | + grep '_[PF]a[si][sl]ed' >$TMP_RESULT + cat bct/$w | sed -e 's/<[^>]*>//g' -e 's/ /_/g' \ + -e 's/signtool_-[vw]/signtool_-vw/' | + grep '_[PF]a[si][sl]ed' >$TMP_BC_RESULT + diff $TMP_RESULT $TMP_BC_RESULT 2>>$BCMISSINGLIST | + grep -v "Create_objsign_cert_.signtool_-G.*Passed" | + grep -v "porting_Alice.s_email_cert" | + grep -v "^[0-9,cad]*$" | grep -v "^---$" | grep -v "^---.$" | + grep -v "Can.t_run_pk12util_tests_for_NSS_3.2" >/dev/null && ( + echo "$w differs" >> $BCMISSINGLIST + echo "=========================================" + echo "diff $w bct/$w" + echo "=========================================" + diff $TMP_RESULT $TMP_BC_RESULT 2>&1 | + grep -v "Create_objsign_cert_.signtool_-G.*Passed" | + grep -v "porting_Alice.s_email_cert" | + grep -v "Can.t_run_pk12util_tests_for_NSS_3.2" + ) 2>&1 >>$BCERRORLIST + + #diff -b $w bct/$w 2>>$BCMISSINGLIST | + #grep -v "Create objsign cert .signtool -G.*Passed" | + #grep -v "Listing signed files in jar .signtool -v.*Passed" | + #grep -v "Listing signed files in jar .signtool -w.*Passed" | + #grep -v "backward compatibility" | + #grep -v "Can.t run pk12util tests for NSS 3.2" | + #grep -v "porting Alice.s email cert " | + #grep -v "^---$" | grep -v "^[<> ] $" | + #grep -v "^---.$" | grep -v "^[<> ] .$" | + #grep -v '< ' | + #grep -v "^[0-9,cad]*$" 2>>$BCMISSINGLIST >/dev/null && ( + #echo "$w differs" >> $BCMISSINGLIST + #echo "=========================================" + #echo "diff $w bct/$w" + #echo "=========================================" + #diff -b $w bct/$w 2>&1 | + #grep -v "Listing signed files in jar .signtool -v.*Passed" | + #grep -v "Listing signed files in jar .signtool -w.*Passed" | + #grep -v "backward compatibility" | + #grep -v "Can.t run pk12util tests for NSS 3.2" | + #grep -v "porting Alice.s email cert " | + #grep -v "^---$" | grep -v "^[<> ] $" | + #grep -v "^---.$" | grep -v "^[<> ] .$" | + #grep -v '< ' | + #grep -v "^[0-9,cad]*$" \ + #) 2>&1 >>$BCERRORLIST + rm $TMP_RESULT $TMP_BC_RESULT 2>/dev/null + done + rm $ERRORLIST + cat $BCMISSINGLIST | sed -e "s/^diff: bc_...s.//" \ + -e "s/.results.html.*/\/results.html/" | + sort -u > $ERRORLIST + + platformlist + echo '' >>$TMP_HTML_FILE + + head -200 $BCERRORLIST | sed -e 's/<[^>]*>//g' -e "s/^/
/" +} + + +############################### bc_test ######################## +# local shell function, evaluates the results of the backward u +# compatibility tests +# move the whole function to old to tests a new solution +######################################################################## +bc_test_old() +{ +CURRENT_TABLE="BC" #so html_line can determine which fields to write + + qa_stat_table "Backward Compatibility Test" + echo 'Build-OS and version' + echo 'QA-OS' + echo 'Systemname' + echo 'P/F' + #echo 'All Current' + #echo 'backward comp. test' + echo 'result' + echo 'output' + echo 'QA time / #' + echo '' + for w in `ls */results.html` do diff -b $w bct/$w 2>>$BCMISSINGLIST |