Update the mozilla tests to new version (as of 2010-06-29).

mozilla-tests/process-logs.sh

 #!/bin/bash -e
 # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
 
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
@@ skipping 95 matching lines @@
                 ;;
             *)
                 echo "unknown log type: $f"
                 exit 2
                 ;;
     esac
 
     case "$testlogfile" in
         *,js,*) testtype=shell;;
         *,firefox,*) testtype=browser;;
+        *,thunderbird,*) testtype=browser;;
+        *,fennec,*) testtype=browser;;
         *) error "unknown testtype in logfile $testlogfile" $LINENO;;
     esac
 
     debug "testtype=$testtype"
 
     case "$testlogfile" in
-        *,nightly,*) buildtype=nightly;;
+        *,nightly*) buildtype=nightly;;
         *,opt,*) buildtype=opt;;
         *,debug,*) buildtype=debug;;
         *) error "unknown buildtype in logfile $testlogfile" $LINENO;
     esac
 
     debug "buildtype=$buildtype"
 
-    case "$testlogfile" in
-        *,1.8.0*) branch=1.8.0;;
-        *,1.8.1*) branch=1.8.1;;
-        *,1.9.0*) branch=1.9.0;;
-        *,1.9.1*) branch=1.9.1;;
-        *) 
-            branch=`grep -m 1 '^environment: TEST_BRANCH=' $worktestlogfile | sed 's|.*TEST_BRANCH=\(.*\)|\1|'`
-            if [[ -z "$branch" ]]; then
-                error "unknown branch in logfile $testlogfile" $LINENO
-            fi
-            ;;
-    esac
+    branch=`echo $testlogfile | sed 's|.*,\([0-9]\.[0-9]*\.[0-9]*\).*|\1|'`
 
     debug "branch=$branch"
 
-    repo=`grep -m 1 '^environment: TEST_MOZILLA_HG=' $worktestlogfile | sed 's|.*TEST_MOZILLA_HG=http://hg.mozilla.org/\(.*\)|\1|'`
+    repo=`grep -m 1 '^environment: TEST_MOZILLA_HG=' $worktestlogfile | sed 's|.*TEST_MOZILLA_HG=http://hg.mozilla.org.*/\([^\/]*\)|\1|'`
     if [[ -z "$repo" ]]; then
         repo=CVS
     fi
     debug "repo=$repo"
 
     case "$testlogfile" in 
         *,nt,*) OSID=nt;;
         *,linux,*) OSID=linux;;
         *,darwin,*) OSID=darwin;;
         *) 
             OSID=`grep -m 1 '^environment: OSID=' $worktestlogfile | sed 's|.*OSID=\(.*\)|\1|'`
             if [[ -z "$OSID" ]]; then
                 error "unknown OS in logfile $testlogfile" $LINENO
             fi
             ;;
     esac
 
     debug "OSID=$OSID"
 
     kernel=`grep -m 1 '^environment: TEST_KERNEL=' $worktestlogfile | sed 's|.*TEST_KERNEL=\(.*\)|\1|'`
     if [[ "$OSID" == "linux" ]]; then
         kernel=`echo $kernel | sed 's|\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*|\1.\2.\3|'`
     fi
     debug "kernel=$kernel"
 
     arch=`grep -m 1 '^environment: TEST_PROCESSORTYPE=' $worktestlogfile | sed 's|.*TEST_PROCESSORTYPE=\(.*\)|\1|'`
     debug "arch=$arch"
 
     memory=`grep -m 1 '^environment: TEST_MEMORY=' $worktestlogfile | sed 's|.*TEST_MEMORY=\(.*\)|\1|'`
-    speed=`grep -m 1 '^environment: TEST_CPUSPEED=' $worktestlogfile | sed 's|.*TEST_CPUSPEED=\(.*\)|\1|'`
 
     timezone=`basename $testlogfile | sed 's|^[-0-9]*\([-+]\)\([0-9]\{4,4\}\),.*|\1\2|'`
+    debug "timezone=$timezone"
 
-    debug "timezone=$timezone"
+    jsoptions=`grep -m 1 '^arguments: javascriptoptions=' $worktestlogfile | sed 's|.*javascriptoptions=\(.*\)|\1|'`
+    if [[ -z "$jsoptions" ]]; then
+        jsoptions=none
+    fi
+    debug "jsoptions=$jsoptions"
 
     outputprefix=$testlogfile
 
     includetests="included-$branch-$testtype-$buildtype.tests"
     excludetests="excluded-$branch-$testtype-$buildtype.tests"
 
     grep '^include: ' $worktestlogfile | sed 's|include: ||' > $TEST_DIR/tests/mozilla.org/js/$includetests
     grep '^exclude: ' $worktestlogfile | sed 's|exclude: ||' > $TEST_DIR/tests/mozilla.org/js/$excludetests
 
     $TEST_DIR/tests/mozilla.org/js/known-failures.pl \
         -b "$branch" \
         -T "$buildtype" \
         -R "$repo" \
         -t "$testtype" \
         -o "$OSID" \
         -K "$kernel" \
         -A "$arch" \
         -M "$memory" \
-        -S "$speed" \
         -z "$timezone" \
+        -J "$jsoptions" \
         -r "$TEST_JSDIR/failures.txt" \
         -l "$worktestlogfile" \
         -O "$outputprefix"
 
     if [[ "$testlogfile" != "$worktestlogfile" ]]; then
         rm $worktestlogfile
         unset worktestlogfile
     fi
 done