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

mozilla-tests/detect-universe.sh

Index: mozilla-tests/detect-universe.sh
===================================================================
--- mozilla-tests/detect-universe.sh	(revision 43940)
+++ mozilla-tests/detect-universe.sh	(working copy)
@@ -41,7 +41,7 @@
     cat <<EOF
 `basename $0`: error
 
-TEST_DIR, the location of the Sisyphus framework, 
+TEST_DIR, the location of the Sisyphus framework,
 is required to be set prior to calling this script.
 EOF
     exit 2
@@ -71,8 +71,8 @@
 
 variable            description
 ===============     ============================================================
--p products         required. one or more of firefox, thunderbird, js
--b branches         required. one or more of 1.8.0, 1.8.1, 1.9.0, 1.9.1
+-p products         required. one or more of firefox, thunderbird, fennec, js
+-b branches         required. one or more of supported branches. set library.sh
 -R repositories     required. one or more of CVS, mozilla-central, ...
 -T buildtype        required. one or more of opt debug
 
@@ -82,15 +82,15 @@
 }
 
 while getopts "p:b:R:T:" optname
-do 
+do
     case $optname in
-        p) 
+        p)
             products=$OPTARG;;
-        b) 
+        b)
             branches=$OPTARG;;
         R)
             repos=$OPTARG;;
-        T) 
+        T)
             buildtypes=$OPTARG;;
     esac
 done
@@ -101,35 +101,26 @@
 
 source $TEST_DIR/bin/library.sh
 
-# convert the numeric speed rating to a prose value
-if [[ $TEST_CPUSPEED -lt 4 ]]; then
-    TEST_CPUSPEED=slow
-elif [[ $TEST_CPUSPEED -lt 9 ]]; then
-    TEST_CPUSPEED=medium
-else
-    TEST_CPUSPEED=fast
-fi
-
 (for product in $products; do
     for branch in $branches; do
         for repo in $repos; do
 
-            if [[ "$branch" == "1.9.1" && $repo == "CVS" ]]; then
+            if [[ ("$branch" != "1.8.0" && "$branch" != "1.8.1" && "$branch" != "1.9.0") && $repo == "CVS" ]]; then
                 continue;
             fi
 
-            if [[ "$branch" != "1.9.1" && $repo != "CVS" ]]; then
+            if [[ ("$branch" == "1.8.0" || "$branch" == "1.8.1" || "$branch" == "1.9.0") && $repo != "CVS" ]]; then
                 continue
             fi
 
-	        for buildtype in $buildtypes; do
-	            if [[ $product == "js" ]]; then
-		            testtype=shell
-	            else
-		            testtype=browser
-	            fi
-	            echo "TEST_OS=$OSID, TEST_KERNEL=$TEST_KERNEL, TEST_PROCESSORTYPE=$TEST_PROCESSORTYPE, TEST_MEMORY=$TEST_MEMORY, TEST_CPUSPEED=$TEST_CPUSPEED, TEST_TIMEZONE=$TEST_TIMEZONE, TEST_BRANCH=$branch, TEST_REPO=$repo, TEST_BUILDTYPE=$buildtype, TEST_TYPE=$testtype"
-	        done
+            for buildtype in $buildtypes; do
+                if [[ $product == "js" ]]; then
+                    testtype=shell
+                else
+                    testtype=browser
+                fi
+                echo "TEST_OS=$OSID, TEST_KERNEL=$TEST_KERNEL, TEST_PROCESSORTYPE=$TEST_PROCESSORTYPE, TEST_MEMORY=$TEST_MEMORY, TEST_TIMEZONE=$TEST_TIMEZONE, TEST_BRANCH=$branch, TEST_REPO=$repo, TEST_BUILDTYPE=$buildtype, TEST_TYPE=$testtype"
+            done
         done
     done
 done) | sort -u