bug 510901 - Sisyphus - support 1.9.3 branch. r=ctalbert.

git-svn-id: svn://10.0.0.236/trunk@258158 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/js/tests/bisect.sh

@@ -76,7 +76,7 @@ usage: bisect.sh -p product -b branch -e extra\\
     variable            description
     ===============     ============================================================
     -p bisect_product     one of js, firefox
-    -b bisect_branches    one of branches 1.8.0, 1.8.1, 1.9.0, 1.9.1, 1.9.2
+    -b bisect_branches    one of supported branches. see library.sh
     -e bisect_extra       optional. extra qualifier to pick build tree and mozconfig.
     -T bisect_buildtype   one of build types opt debug
     -t bisect_test        Test to be bisected.
@@ -159,8 +159,8 @@ PYTHON=$savepython
 # /c/work/...
 TEST_JSDIR=${TEST_JSDIR:-$TEST_DIR/tests/mozilla.org/js}
 
-case $bisect_branch in
+if [[ "$bisect_branch" == "1.8.0" || "$bisect_branch" == "1.8.1" || \
-    1.8.*|1.9.0)
+    "$bisect_branch" == "1.9.0" ]]; then
 
     #
     # binary search using CVS
@@ -320,9 +320,7 @@ EOF
         fi
 
     done
-        ;;
+else
-
-    1.9.1|1.9.2)
     #
     # binary search using mercurial
     #
@@ -487,5 +485,4 @@ EOF
         fi
 
     done
-        ;;
+fi
-esac

mozilla/js/tests/detect-universe.sh

@@ -72,7 +72,7 @@ Outputs to stdout the universe data for this machine.
 variable            description
 ===============     ============================================================
 -p products         required. one or more of firefox, thunderbird, fennec, js
--b branches         required. one or more of 1.8.0, 1.8.1, 1.9.0, 1.9.1, 1.9.2
+-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
 

mozilla/js/tests/known-failures.pl

@@ -538,30 +538,17 @@ sub parse_options {
         usage "missing outputprefix";
     }
 
-    if ($branch eq "1.8.0") {
+    if ($branch eq "all") {
-        $knownfailurebranchpattern = "(1\\.8\\.0|\\.\\*)";
-        $failurebranchpattern      = "1\\.8\\.0";
-    }
-    elsif ($branch eq "1.8.1") {
-        $knownfailurebranchpattern = "(1\\.8\\.1|\\.\\*)";
-        $failurebranchpattern      = "1\\.8\\.1";
-    }
-    elsif ($branch eq "1.9.0") {
-        $knownfailurebranchpattern = "(1\\.9\\.0|\\.\\*)";
-        $failurebranchpattern      = "1\\.9\\.0";
-    }
-    elsif ($branch eq "1.9.1") {
-        $knownfailurebranchpattern = "(1\\.9\\.1|\\.\\*)";
-        $failurebranchpattern      = "1\\.9\\.1";
-    }
-    elsif ($branch eq "1.9.2") {
-        $knownfailurebranchpattern = "(1\\.9\\.2|\\.\\*)";
-        $failurebranchpattern      = "1\\.9\\.2";
-    }
-    elsif ($branch eq "all") {
         $knownfailurebranchpattern = "[^,]*";
         $failurebranchpattern      = "[^,]*";
     }
+    else {
+        $knownfailurebranchpattern = "($branch|.*)";
+        $knownfailurebranchpattern =~ s/\./\\./g;
+
+        $failurebranchpattern = "$branch";
+        $failurebranchpattern =~ s/\./\\./g;
+    }
 
     if ($repo eq "all" || $repo eq ".*") {
         $knownfailurerepopattern = "[^,]*";

mozilla/js/tests/process-logs.sh

@@ -129,19 +129,7 @@ for testlogfile in `ls $testlogfiles`; do
 
     debug "buildtype=$buildtype"
 
-    case "$testlogfile" in
+    branch=`echo $testlogfile | sed 's|.*,\([0-9]\.[0-9]*\.[0-9]*\).*|\1|'`
-        *,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;;
-        *,1.9.2*) branch=1.9.2;;
-        *) 
-            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
 
     debug "branch=$branch"
 

mozilla/js/tests/runtests.sh

@@ -74,8 +74,7 @@ usage: runtests.sh -p products -b branches -e extra\\
 variable            description
 ===============     ============================================================
 -p products         space separated list of js, firefox, fennec
--b branches         space separated list of branches 1.8.0, 1.8.1, 1.9.0, 1.9.1,
+-b branches         space separated list of supported branches. see library.sh
-                    1.9.2.
 -e extra            optional. extra qualifier to pick build tree and mozconfig.
 -T buildtypes       space separated list of build types opt debug
 -B buildcommands    optional space separated list of build commands
@@ -204,14 +203,8 @@ for testlogfile in $testlogfiles; do
         *) error "unknown buildtype in logfile $testlogfile" $LINENO;;
     esac
 
-    case "$testlogfile" in
+    branch=`echo $testlogfile | sed 's|.*,\([0-9]\.[0-9]*\.[0-9]*\).*|\1|'`
-        *,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;;
-        *,1.9.2*) branch=1.9.2;;
-        *) error "unknown branch in logfile $testlogfile" $LINENO;;
-    esac
 
     repo=`grep -m 1 '^environment: TEST_MOZILLA_HG=' $testlogfile | sed 's|.*TEST_MOZILLA_HG=http://hg.mozilla.org.*/\([^\/]*\)|\1|'`
     if [[ -z "$repo" ]]; then

mozilla/js/tests/test.sh

@@ -81,7 +81,7 @@ usage: test.sh -p product -b branch -T buildtype -x executablepath -N profilenam
 variable            description
 ===============     ============================================================
 -p product          required. firefox|thunderbird|js|fennec
--b branch           required. one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch           required. one of supported branches. see library.sh.
 -s jsshellsourcepath       required for shell. path to js shell source directory mozilla/js/src
 -T buildtype        required. one of opt debug
 -x executablepath   required for browser. directory-tree containing executable 'product'
@@ -325,6 +325,9 @@ if [[ -z "$includetests" ]]; then
         1.9.2)
             includetests="$includetests js1_7 js1_8 ecma_3_1 js1_8_1"
             ;;
+        1.9.3)
+            includetests="$includetests js1_7 js1_8 ecma_3_1 js1_8_1"
+            ;;
     esac
 fi
 

mozilla/testing/sisyphus/bin/build.sh

@@ -41,7 +41,7 @@ source $TEST_DIR/bin/library.sh
 source $TEST_DIR/bin/set-build-env.sh $@
 
 case $product in
-    firefox|thunderbird|fennec)
+    firefox)
         cd $BUILDTREE/mozilla
 
         if ! $buildbash $bashlogin -c "export PATH=\"$BUILDPATH\"; cd $BUILDTREE/mozilla; make -f client.mk build" 2>&1; then
@@ -64,18 +64,10 @@ case $product in
                 if [[ "$buildtype" == "debug" ]]; then
                     if [[ "$product" == "firefox" ]]; then
                         executablepath=$product-$buildtype/dist/FirefoxDebug.app/Contents/MacOS
-                    elif [[ "$product" == "thunderbird" ]]; then
-                        executablepath=$product-$buildtype/dist/ThunderbirdDebug.app/Contents/MacOS
-                    elif [[ "$product" == "fennec" ]]; then
-                        executablepath=$product-$buildtype/dist/FennecDebug.app/Contents/MacOS
                     fi
                 else
                     if [[ "$product" == "firefox" ]]; then
                         executablepath=$product-$buildtype/dist/Firefox.app/Contents/MacOS
-                    elif [[ "$product" == "thunderbird" ]]; then
-                        executablepath=$product-$buildtype/dist/Thunderbird.app/Contents/MacOS
-                    elif [[ "$product" == "fennec" ]]; then
-                        executablepath=$product-$buildtype/dist/Fennec.app/Contents/MacOS
                     fi
                 fi
                 ;;
@@ -84,7 +76,7 @@ case $product in
                 ;;
         esac
 
-        if [[ "$OSID" != "nt" && "$product" != "fennec" ]]; then
+        if [[ "$OSID" != "nt" ]]; then
             #
             # patch unix-like startup scripts to exec instead of 
             # forking new processes

mozilla/testing/sisyphus/bin/builder.sh

@@ -53,8 +53,8 @@ $SCRIPT -p products -b branches -B buildcommands -T buildtypes [-e extra] [-d da
 
 variable            description
 ===============     ===========================================================
--p products         required. one or more of js firefox thunderbird fennec
+-p products         required. one or more of js firefox
--b branches         required. one or more of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branches         required. one or more of supported branches. see library.sh.
 -B buildcommands    required. one or more of clean clobber checkout build
 -T buildtypes       required. one or more of opt debug
 -e extra            optional. extra qualifier to pick build tree and mozconfig.

mozilla/testing/sisyphus/bin/check-spider.sh

@@ -54,8 +54,8 @@ $SCRIPT -p product -b branch -x executablepath -N profilename
 
 variable            description
 ===============     ============================================================
--p product          required. firefox, thunderbird or fennec
+-p product          required. firefox
--b branch           required. 1.8.0|1.8.1|1.9.0|1.9.1
+-b branch           required. supported branch. see library.sh
 -x executablepath   required. directory-tree containing executable named
                     'product'
 -N profilename      required. name of profile to be used
@@ -118,4 +118,3 @@ while ! $TEST_DIR/bin/timed_run.py ${TEST_STARTUP_TIMEOUT} "Start Spider: try $t
   fi
   sleep 30
 done
-

mozilla/testing/sisyphus/bin/checkout.sh

@@ -127,8 +127,7 @@ case $product in
                 fi
                 ;;
 
-            1.9.1|1.9.2)
+            *)
-
                 # do not use mozilla-build on windows systems as we
                 # must use the cygwin python with the cygwin mercurial.
 
@@ -136,91 +135,6 @@ case $product in
                     error "during checkout of $project tree" $LINENO
                 fi
                 ;;
-
-            *)
-                error "branch $branch not yet supported"
-                ;;
-        esac
-        ;;
-
-    thunderbird)
-
-        case $branch in
-            1.8.*|1.9.0)
-                if [[ ! ( -d mozilla && \
-                    -e mozilla/client.mk && \
-                    -e "mozilla/$project/config/mozconfig" ) ]]; then
-                    if ! eval cvs -z3 -q co $MOZ_CO_FLAGS $BRANCH_CO_FLAGS $DATE_CO_FLAGS \
-                        mozilla/client.mk mozilla/$project/config/mozconfig; then
-                        error "during checkout of $MOZ_CO_FLAGS $BRANCH_CO_FLAGS $DATE_CO_FLAGS $project mozconfig" $LINENO
-                    fi
-                fi
-
-                if [[ ! ( -d mozilla && \
-                    -e mozilla/client.mk && \
-                    -e "mozilla/browser/config/mozconfig" ) ]]; then
-                    if ! eval cvs -z3 -q co $MOZ_CO_FLAGS $BRANCH_CO_FLAGS $DATE_CO_FLAGS \
-                        mozilla/client.mk mozilla/browser/config/mozconfig; then
-                        error "during checkout of $MOZ_CO_FLAGS $BRANCH_CO_FLAGS $DATE_CO_FLAGS browser mozconfig" $LINENO
-                    fi
-                fi
-
-                if ! $buildbash $bashlogin -c "export PATH=\"$BUILDPATH\"; cd $BUILDTREE/mozilla; make -f client.mk checkout" 2>&1; then
-                    error "during checkout of $project tree" $LINENO
-                fi
-                ;;
-
-            1.9.1|1.9.2)
-
-                # do not use mozilla-build on windows systems as we 
-                # must use the cygwin python with the cygwin mercurial.
-
-                if ! python client.py checkout; then
-                    error "during checkout of $project tree" $LINENO
-                fi
-                ;;
-
-            *)
-                error "branch $branch not yet supported"
-                ;;
-        esac
-        ;;
-
-    fennec)
-
-        case $branch in
-            1.9.1|1.9.2)
-
-                # XXX need to generalize the mobile-browser repository
-                if [[ ! -d mobile/.hg ]]; then
-                    if ! hg clone http://hg.mozilla.org/mobile-browser $BUILDTREE/mozilla/mobile; then
-                        error "during hg clone of http://hg.mozilla.org/mobile-browser" $LINENO
-                    fi
-                fi
-
-                cd mobile
-                hg pull
-                if [[ "$OSID" == "nt" ]]; then
-                    # remove spurious lock file
-                    rm -f .hg/wlock.lnk
-                fi
-                hg update -C
-
-                # XXX need to deal with mobile revisions from different repositories
-
-                cd ../
-
-                # do not use mozilla-build on windows systems as we
-                # must use the cygwin python with the cygwin mercurial.
-
-                if ! python client.py checkout; then
-                    error "during checkout of $project tree" $LINENO
-                fi
-                ;;
-
-            *)
-                error "branch $branch not yet supported"
-                ;;
         esac
         ;;
 
@@ -247,7 +161,7 @@ case $product in
                 fi
                 ;;
 
-            1.9.1|1.9.2)
+            *)
 
                 # do not use mozilla-build on windows systems as we
                 # must use the cygwin python with the cygwin mercurial.
@@ -258,10 +172,6 @@ case $product in
 
                 cd js/src
                 ;;
-
-            *)
-                error "branch $branch not yet supported"
-                ;;
         esac
         # end for js shell
         ;;

mozilla/testing/sisyphus/bin/clean.sh

@@ -41,7 +41,7 @@ source $TEST_DIR/bin/library.sh
 source $TEST_DIR/bin/set-build-env.sh $@
 
 case $product in
-    firefox|thunderbird|fennec)
+    firefox)
 
         if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk clean" 2>&1; then
             error "during client.mk clean" $LINENO

mozilla/testing/sisyphus/bin/clobber.sh

@@ -46,7 +46,7 @@ if [[ ! -e "$BUILDDIR" ]]; then
 fi
 
 case $product in
-    firefox|thunderbird|fennec)
+    firefox)
 
         if [[ ! -e "$executablepath" ]]; then
             echo "executable path $executablepath doesn't exist, ignoring clobber"

mozilla/testing/sisyphus/bin/create-profile.sh

@@ -52,8 +52,8 @@ $SCRIPT -p product -b branch -x executablepath -D directory -N profilename
 
 variable            description
 ===============     ============================================================
--p product          required. firefox, thunderbird or fennec
+-p product          required. firefox.
--b branch           required. one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch           required. supported branch. see library.sh
 -x executablepath   required. directory-tree containing executable 'product'
 -D directory        required. directory where profile is to be created.
 -N profilename      required. profile name

mozilla/testing/sisyphus/bin/edit-talkback.sh

@@ -51,7 +51,7 @@ $SCRIPT -p product -b branch -x executablepath -i talkbackid [-d datafiles]
 
 variable            description
 ===============     ============================================================
--p product          required. firefox|thunderbird
+-p product          required. firefox.
 -b branch           required. one of 1.8.0 1.8.1
 -x executablepath   required. directory-tree containing executable named
                     'product'

mozilla/testing/sisyphus/bin/install-build.sh

@@ -51,8 +51,8 @@ $SCRIPT -p product -b branch  -x executablepath -f filename [-d datafiles]
 
 variable            description
 ===============     ============================================================
--p product          required. firefox, thunderbird or fennec
+-p product          required. firefox.
--b branch           required. one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch           required. supported branch. see library.sh
 -x executablepath   required. directory where to install build
 -f filename         required. path to filename where installer is stored
 -d datafiles        optional. one or more filenames of files containing
@@ -138,7 +138,6 @@ else
             ;;
     esac
 
-    if [[ "$product" != "fennec" ]]; then
     #
     # patch unix-like startup scripts to exec instead of
     # forking new processes
@@ -159,6 +158,4 @@ else
         cp $TEST_DIR/bin/run-mozilla.diff .
         patch -N -p0 < run-mozilla.diff
     fi
-    fi
 fi
-

mozilla/testing/sisyphus/bin/install-extensions.sh

@@ -54,8 +54,8 @@ $SCRIPT -p product -b branch -x executablepath -N profilename -E extensiondir
 
 variable            description
 ===============     ============================================================
--p product          required. firefox, thunderbird or fennec
+-p product          required. firefox.
--b branch           required. one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch           required. supported branch. see library.sh
 -x executablepath   required. directory-tree containing executable named
                     'product'
 -N profilename      required. profile name

mozilla/testing/sisyphus/bin/install-plugins.sh

@@ -51,8 +51,8 @@ $SCRIPT -p product -b branch -x executablepath -D directory [-d datafiles]
 
 variable            description
 ===============     ============================================================
--p product          required. firefox, thunderbird or fennec
+-p product          required. firefox.
--b branch           required. one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch           required. one of supported branches. see library.sh
 -x executablepath   required. path to browser executable
 -D directory        required. path to location of plugins/components
 -d datafiles        optional. one or more filenames of files containing
@@ -98,4 +98,3 @@ executablepath=`dirname $executable`
 #
 echo "$SCRIPT: installing plugins from $directory/ in $executablepath/"
 cp -r "$directory/$OSID/" "$executablepath/"
-

mozilla/testing/sisyphus/bin/library.sh

@@ -112,33 +112,19 @@ if [[ -z "$LIBRARYSH" ]]; then
         local branch=$2
 
         case $product in
-            js|firefox|thunderbird|fennec)
+            js|firefox)
                 ;;
             *)
-                error "product \"$product\" must be one of firefox, thunderbird, or fennec" $LINENO
+                error "product \"$product\" must be one of js or firefox" $LINENO
         esac
 
         case $branch in
-            1.8.0|1.8.1|1.9.0|1.9.1|1.9.2)
+            1.8.0|1.8.1|1.9.0|1.9.1|1.9.2|1.9.3)
                 ;;
             *)
-                error "branch \"$branch\" must be one of 1.8.0, 1.8.1, 1.9.0 1.9.1 1.9.2" $LINENO
+                error "branch \"$branch\" must be one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2 1.9.3" $LINENO
         esac
 
-        # special case thunderbird and fennec due to their different
-        # repository and build tree structures.
-        case "$product" in
-            "thunderbird")
-                if [[ $branch == "1.9.2" ]]; then
-                    error "thunderbird on branch 1.9.2 is not supported"
-                fi
-                ;;
-            "fennec")
-                if [[ $branch != "1.9.1" && "$branch" != "1.9.2" ]]; then
-                    error "fennec on branch $branch is not supported"
-                fi
-                ;;
-        esac
      }
 
     # Darwin 8.11.1's |which| does not return a non-zero exit code if the
@@ -267,9 +253,6 @@ if [[ -z "$LIBRARYSH" ]]; then
                 case "$OSID" in
                     darwin)
                         get_executable_filter="Contents/MacOS/$get_executable_product"
-                        if [[ "$get_executable_product" == "thunderbird" ]]; then
-                            get_executable_name="$get_executable_product-bin"
-                        fi
                         ;;
                     *)
                         get_executable_filter="$get_executable_product"

mozilla/testing/sisyphus/bin/set-build-env.sh

@@ -64,8 +64,8 @@ usage()
 
 usage: set-build-env.sh -p product -b branch -T buildtype [-e extra]
 
--p product      one of js firefox thunderbird fennec
+-p product      one of js firefox.
--b branch       one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch       one of supported branches. see library.sh
 -T buildtype    one of opt debug
 -e extra        extra qualifier to pick mozconfig and tree
 
@@ -130,8 +130,12 @@ for step in step1; do # dummy loop for handling exits
     elif [[ $branch == "1.9.0" ]]; then
         export BRANCH_CO_FLAGS="";
     elif [[ $branch == "1.9.1" ]]; then
+        TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
         export BRANCH_CO_FLAGS="";
     elif [[ $branch == "1.9.2" ]]; then
+        TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
+        export BRANCH_CO_FLAGS="";
+    elif [[ $branch == "1.9.3" ]]; then
         TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
         export BRANCH_CO_FLAGS="";
     else
@@ -227,8 +231,9 @@ for step in step1; do # dummy loop for handling exits
                         startbat=start-msvc71.bat
                     fi
                     ;;
-                1.9.0|1.9.1|1.9.2)
+                *)
                     # msvc8 official, vc7.1, (2003), vc9 (2009) supported
+                    # for 1.9.0 and later
                     if [[ -n "$VC8DIR" ]]; then
                         startbat=start-msvc8.bat
                         # set VCINSTALLDIR for use in detecting the MS CRT
@@ -339,16 +344,7 @@ for step in step1; do # dummy loop for handling exits
     export CONFIG_SHELL=$buildbash
     export CONFIGURE_ENV_ARGS=$buildbash
 
-    # note that thunderbird and fennec based on 1.9.1 can not be contained in the
-    # same tree as firefox since they come from different repositories.
-    case "$branch-$product" in
-        1.9.1-thunderbird)
-            export BUILDTREE="${BUILDTREE:-$BUILDDIR/$branch-$product$extra}"
-            ;;
-        *)
     export BUILDTREE="${BUILDTREE:-$BUILDDIR/$branch$extra}"
-            ;;
-    esac
 
     #
     # extras can't be placed in mozconfigs since not all parts
@@ -400,32 +396,14 @@ for step in step1; do # dummy loop for handling exits
                 export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
                 ;;
             1.9.2)
+                export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
+                ;;
+            1.9.3)
                 export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
                 ;;
         esac
         export MOZCONFIG=${MOZCONFIG:-"$BUILDTREE/mozconfig-firefox-$OSID-$TEST_PROCESSORTYPE-$buildtype"}
 
-    elif [[ $product == "thunderbird" ]]; then
-        project=mail
-        case $branch in
-            1.8.*);;
-            1.9.0);;
-            *)
-                export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/comm-central}
-                ;;
-        esac
-        export MOZCONFIG=${MOZCONFIG:-"$BUILDTREE/mozconfig-thunderbird-$OSID-$TEST_PROCESSORTYPE-$buildtype"}
-    elif [[ $product == "fennec" ]]; then
-        project=mobile
-        case $branch in
-            1.9.1)
-                export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-                ;;
-            1.9.2)
-                export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
-                ;;
-        esac
-        export MOZCONFIG=${MOZCONFIG:-"$BUILDTREE/mozconfig-fennec-$OSID-$TEST_PROCESSORTYPE-$buildtype"}
     else
         echo "Assuming project=browser for product: $product"
         project=browser
@@ -434,6 +412,9 @@ for step in step1; do # dummy loop for handling exits
                 export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
                 ;;
             1.9.2)
+                export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
+                ;;
+            1.9.3)
                 export TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
                 ;;
         esac
@@ -471,24 +452,6 @@ for step in step1; do # dummy loop for handling exits
         js)
             jsshellsourcepath=${jsshellsourcepath:-$BUILDTREE/mozilla/js/src}
             ;;
-        thunderbird)
-            profilename=${profilename:-$product-$branch$extra-profile}
-            profiledirectory=${profiledirectory:-/tmp/$product-$branch$extra-profile}
-            userpreferences=${userpreferences:-$TEST_DIR/prefs/test-user.js}
-            extensiondir=${extensiondir:-$TEST_DIR/xpi}
-            if [[ $branch == "1.8.0" || $branch = "1.8.1" || $branch == "1.9.0" ]]; then
-                executablepath=${executablepath:-$BUILDTREE/mozilla/$product-$buildtype/dist}
-            else
-                executablepath=${executablepath:-$BUILDTREE/mozilla/$product-$buildtype/mozilla/dist}
-            fi
-            ;;
-        fennec)
-            profilename=${profilename:-$product-$branch$extra-profile}
-            profiledirectory=${profiledirectory:-/tmp/$product-$branch$extra-profile}
-            userpreferences=${userpreferences:-$TEST_DIR/prefs/test-user.js}
-            extensiondir=${extensiondir:-$TEST_DIR/xpi}
-            executablepath=${executablepath:-$BUILDTREE/mozilla/$product-$buildtype/mobile/dist}
-            ;;
     esac
 
     if [[ -n "$datafiles" && ! -e $datafiles ]]; then
@@ -518,4 +481,3 @@ for step in step1; do # dummy loop for handling exits
     echo "mozconfig: $MOZCONFIG"
     cat $MOZCONFIG | sed 's/^/mozconfig: /'
 done
-

mozilla/testing/sisyphus/bin/test-setup.sh

@@ -58,8 +58,8 @@ $SCRIPT -p product -b branch
 
 variable            description
 ===============     ===========================================================
--p product          required. one of js firefox, thunderbird or fennec
+-p product          required. one of js firefox.
--b branch           required. one of 1.8.0 1.8.1 1.9.0 1.9.1 1.9.2
+-b branch           required. supported branch. see library.sh
 -u url              optional. url where to download build
 -f filepath         optional. location to save downloaded build or to find
                     previously downloaded build. If not specified, the
@@ -212,10 +212,6 @@ if [[ -n "$buildcommands" ]]; then
         mac)
             if [[ "$product" == "firefox" ]]; then
                 App=Firefox
-            elif [[ "$product" == "thunderbird" ]]; then
-                App=Thunderbird
-            elif [[ "$product" == "fennec" ]]; then
-                App=Fennec
             fi
             if [[ "$buildtype" == "debug" ]]; then
                 AppType=Debug

mozilla/testing/sisyphus/bin/uninstall-build.sh

@@ -51,8 +51,8 @@ $SCRIPT -p product -b branch  -x executablepath [-d datafiles]
 
 variable            description
 ===============     ============================================================
--p product          required. firefox, thunderbird or fennec
+-p product          required. firefox.
--b branch           required. 1.8.0|1.8.1|1.9.0|1.9.1
+-b branch           required. supported branch. see library.sh
 -x executablepath   required. directory where build is installed
 -d datafiles        optional. one or more filenames of files containing
                     environment variable definitions to be included.
@@ -114,7 +114,7 @@ if [[ $OSID == "nt" ]]; then
                     if $uninstallexe; then true; fi
                 fi
             fi
-        elif [[ "$branch" == "1.8.1" || "$branch" == "1.9.0" || "$branch" == "1.9.1" || "$branch" == "1.9.2" ]]; then
+        else
             uninstalloldexe="$executabledir/uninstall/uninst.exe"
             uninstallnewexe="$executabledir/uninstall/helper.exe"
             if [[ -n "$uninstallnewexe" && -e "$uninstallnewexe" ]]; then
@@ -127,8 +127,6 @@ if [[ $OSID == "nt" ]]; then
                     if $uninstallexe /S /D=`cygpath -a -w "$executabledir"  | sed 's@\\\\@\\\\\\\\@g'`; then true; fi
                 fi
             fi
-        else
-            error "Unknown branch $branch" $LINENO
         fi
         # the NSIS uninstaller will copy itself, then fork to the new
         # copy so that it can delete itself. This causes a race condition
@@ -146,4 +144,3 @@ fi
 $TEST_DIR/bin/create-directory.sh -d "$executablepath" -n
 
 rm -fR "$executablepath"
-

mozilla/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/1.5.0.12-candidates/rc2/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,linux.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/1.5.0.12-candidates/rc2/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,nt.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/1.5.0.12-candidates/rc2/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.14-candidates/rc2/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,linux.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.14-candidates/rc2/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,nt.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/2.0.0.14-candidates/rc2/
-product=firefox
-branch=1.8.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.win32.zip
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-all,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://www.mozilla.com/en-US/firefox/all.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-all,linux.data

@@ -1,11 +0,0 @@
-allurl=http://www.mozilla.com/en-US/firefox/all.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-all,nt.data

@@ -1,11 +0,0 @@
-allurl=http://www.mozilla.com/en-US/firefox/all.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-all-older,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://khan.landfill.bugzilla.org/en-US/firefox/all-older.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-all-older,linux.data

@@ -1,11 +0,0 @@
-allurl=http://khan.landfill.bugzilla.org/en-US/firefox/all-older.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,firefox-all-older,nt.data

@@ -1,11 +0,0 @@
-allurl=http://khan.landfill.bugzilla.org/en-US/firefox/all-older.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.14/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,linux.data

@@ -1,11 +0,0 @@
-allurl=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.14/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,nt.data

@@ -1,11 +0,0 @@
-allurl=http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/1.5.0.14/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,linux.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,nt.data

@@ -1,11 +0,0 @@
-allurl=http://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.14/
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=ftp
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-all,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://www.mozilla.com/en-US/thunderbird/all.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-all,linux.data

@@ -1,11 +0,0 @@
-allurl=http://www.mozilla.com/en-US/thunderbird/all.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-all,nt.data

@@ -1,11 +0,0 @@
-allurl=http://www.mozilla.com/en-US/thunderbird/all.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-all-older,darwin.data

@@ -1,11 +0,0 @@
-allurl=http://khan.landfill.bugzilla.org/en-US/thunderbird/all-older.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/mac/en-US/Firefox%202.0.0.14.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-all-older,linux.data

@@ -1,11 +0,0 @@
-allurl=http://khan.landfill.bugzilla.org/en-US/thunderbird/all-older.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/linux-i686/en-US/firefox-2.0.0.14.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/download-check,thunderbird-all-older,nt.data

@@ -1,11 +0,0 @@
-allurl=http://khan.landfill.bugzilla.org/en-US/thunderbird/all-older.html
-product=firefox
-branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.14/win32/en-US/Firefox%20Setup%202.0.0.14.exe
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-test=all
-buildtype=nightly

mozilla/testing/sisyphus/data/fennec,1.9.1,debug.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-fennec-1.9.1-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.1-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1/mozilla/fennec-debug/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.1,nightly-darwin.data

@@ -1,10 +0,0 @@
-product=fennec
-branch=1.9.1
-url=http://ftp.mozilla.org/pub/mozilla.org/mobile/fennec-1.0a2.en-US.mac.dmg
-profilename=fennec-1.9.1-profile
-profiledirectory=/tmp/fennec-1.9.1-profile
-executablepath=/tmp/fennec-1.9.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly
-TEST_MOZILLA_HG=http://hg.mozilla.org/releases/mozilla-1.9.1

mozilla/testing/sisyphus/data/fennec,1.9.1,nightly-linux.data

@@ -1,10 +0,0 @@
-product=fennec
-branch=1.9.1
-url=http://ftp.mozilla.org/pub/mozilla.org/mobile/fennec-1.0a2.en-US.linux-i686.tar.bz2
-profilename=fennec-1.9.1-profile
-profiledirectory=/tmp/fennec-1.9.1-profile
-executablepath=/tmp/fennec-1.9.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly
-TEST_MOZILLA_HG=http://hg.mozilla.org/releases/mozilla-1.9.1

mozilla/testing/sisyphus/data/fennec,1.9.1,nightly-nt.data

@@ -1,10 +0,0 @@
-product=fennec
-branch=1.9.1
-url=http://ftp.mozilla.org/pub/mozilla.org/mobile/fennec-1.0a2.en-US.win32.zip
-profilename=fennec-1.9.1-profile
-profiledirectory=/tmp/fennec-1.9.1-profile
-executablepath=/tmp/fennec-1.9.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly
-TEST_MOZILLA_HG=http://hg.mozilla.org/releases/mozilla-1.9.1

mozilla/testing/sisyphus/data/fennec,1.9.1,opt.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-fennec-1.9.1-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.1-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1/mozilla/fennec-opt/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.1-test,debug.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-fennec-1.9.1-test-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.1-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-test/mozilla/fennec-debug/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.1-test,opt.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-fennec-1.9.1-test-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.1-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-test/mozilla/fennec-opt/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.2,debug.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.2}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-fennec-1.9.2-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.2-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.2/mozilla/fennec-debug/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.2,opt.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.2}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-fennec-1.9.2-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.2-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.2/mozilla/fennec-opt/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.2-test,debug.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.2}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-fennec-1.9.2-test-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.2-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.2-test/mozilla/fennec-debug/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/fennec,1.9.2-test,opt.data

@@ -1,10 +0,0 @@
-product=${product:-fennec}
-branch=${branch:-1.9.2}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-fennec-1.9.2-test-profile}
-profiledirectory=${profiledirectory:-/tmp/fennec-1.9.2-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.2-test/mozilla/fennec-opt/mobile/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.8.0,nightly-darwin.data

@@ -1,9 +0,0 @@
-product=firefox
-branch=1.8.0
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.12eol.en-US.mac.dmg
-profilename=firefox-1.8.0-profile
-profiledirectory=/tmp/firefox-1.8.0-profile
-executablepath=/tmp/firefox-1.8.0
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly

mozilla/testing/sisyphus/data/firefox,1.8.0,nightly-linux.data

@@ -1,9 +0,0 @@
-product=firefox
-branch=1.8.0
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.12eol.en-US.linux-i686.tar.gz
-profilename=firefox-1.8.0-profile
-profiledirectory=/tmp/firefox-1.8.0-profile
-executablepath=/tmp/firefox-1.8.0
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly

mozilla/testing/sisyphus/data/firefox,1.8.0,nightly-nt.data

@@ -1,9 +0,0 @@
-product=firefox
-branch=1.8.0
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.12eol.en-US.win32.zip
-profilename=firefox-1.8.0-profile
-profiledirectory=/tmp/firefox-1.8.0-profile
-executablepath=/tmp/firefox-1.8.0
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly

mozilla/testing/sisyphus/data/firefox,1.8.1,nightly-darwin.data

@@ -1,9 +0,0 @@
-product=firefox
-branch=1.8.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.15pre.en-US.mac.dmg
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly

mozilla/testing/sisyphus/data/firefox,1.8.1,nightly-linux.data

@@ -1,9 +0,0 @@
-product=firefox
-branch=1.8.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.15pre.en-US.linux-i686.tar.gz
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly

mozilla/testing/sisyphus/data/firefox,1.8.1,nightly-nt.data

@@ -1,9 +0,0 @@
-product=firefox
-branch=1.8.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.15pre.en-US.win32.zip
-profilename=firefox-1.8.1-profile
-profiledirectory=/tmp/firefox-1.8.1-profile
-executablepath=/tmp/firefox-1.8.1
-userpreferences=${TEST_DIR}/prefs/test-user.js
-extensiondir=${TEST_DIR}/xpi
-buildtype=nightly

mozilla/testing/sisyphus/data/firefox,1.9.0,nightly-darwin.data

@@ -1,6 +1,6 @@
 product=firefox
 branch=1.9.0
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.mac.dmg
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0.14pre.en-US.mac.dmg
 profilename=firefox-1.9.0-profile
 profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/tmp/firefox-1.9.0

mozilla/testing/sisyphus/data/firefox,1.9.0,nightly-linux.data

@@ -1,6 +1,6 @@
 product=firefox
 branch=1.9.0
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.linux-i686.tar.bz2
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0.14pre.en-US.linux-i686.tar.bz2
 profilename=firefox-1.9.0-profile
 profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/tmp/firefox-1.9.0

mozilla/testing/sisyphus/data/firefox,1.9.0,nightly-nt.data

@@ -1,6 +1,6 @@
 product=firefox
 branch=1.9.0
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.win32.zip
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0.14pre.en-US.win32.zip
 profilename=firefox-1.9.0-profile
 profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/tmp/firefox-1.9.0

mozilla/testing/sisyphus/data/firefox,1.9.0-jemalloc,debug.data

@@ -1,8 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.0}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.0-jemalloc-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.0-jemalloc-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.0-jemalloc/mozilla/firefox-debug/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}

mozilla/testing/sisyphus/data/firefox,1.9.0-jemalloc,opt.data

@@ -1,8 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.0}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.0-jemalloc-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.0-jemalloc-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.0-jemalloc/mozilla/firefox-opt/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}

mozilla/testing/sisyphus/data/firefox,1.9.0-jemalloc-test,debug.data

@@ -1,8 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.0}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.0-jemalloc-test-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.0-jemalloc-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.0-jemalloc-test/mozilla/firefox-debug/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}

mozilla/testing/sisyphus/data/firefox,1.9.0-jemalloc-test,opt.data

@@ -1,8 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.0}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.0-jemalloc-test-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.0-jemalloc-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.0-jemalloc-test/mozilla/firefox-opt/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}

mozilla/testing/sisyphus/data/firefox,1.9.1,nightly-darwin.data

@@ -1,6 +1,6 @@
 product=firefox
 branch=1.9.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.mac.dmg
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-1.9.1/firefox-3.5.3pre.en-US.mac.dmg
 profilename=firefox-1.9.1-profile
 profiledirectory=/tmp/firefox-1.9.1-profile
 executablepath=/tmp/firefox-1.9.1

mozilla/testing/sisyphus/data/firefox,1.9.1,nightly-linux.data

@@ -1,6 +1,6 @@
 product=firefox
 branch=1.9.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.linux-i686.tar.bz2
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-1.9.1/firefox-3.5.3pre.en-US.linux-i686.tar.bz2
 profilename=firefox-1.9.1-profile
 profiledirectory=/tmp/firefox-1.9.1-profile
 executablepath=/tmp/firefox-1.9.1

mozilla/testing/sisyphus/data/firefox,1.9.1,nightly-nt.data

@@ -1,6 +1,6 @@
 product=firefox
 branch=1.9.1
-url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0pre.en-US.win32.zip
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-1.9.1/firefox-3.5.3pre.en-US.win32.zip
 profilename=firefox-1.9.1-profile
 profiledirectory=/tmp/firefox-1.9.1-profile
 executablepath=/tmp/firefox-1.9.1

mozilla/testing/sisyphus/data/firefox,1.9.1-actionmonkey,debug.data

@@ -1,10 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.1-actionmonkey-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-actionmonkey-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-actionmonkey/mozilla/firefox-debug/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/actionmonkey}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.1-actionmonkey,opt.data

@@ -1,10 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.1-actionmonkey-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-actionmonkey-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-actionmonkey/mozilla/firefox-opt/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/actionmonkey}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.1-jemalloc,debug.data

@@ -1,10 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.1-jemalloc-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-jemalloc-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-jemalloc/mozilla/firefox-debug/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.1-jemalloc,opt.data

@@ -1,10 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.1-jemalloc-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-jemalloc-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-jemalloc/mozilla/firefox-opt/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.1-jemalloc-test,debug.data

@@ -1,10 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.1-jemalloc-test-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-jemalloc-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-jemalloc-test/mozilla/firefox-debug/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.1-jemalloc-test,opt.data

@@ -1,10 +0,0 @@
-product=${product:-firefox}
-branch=${branch:-1.9.1}
-buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.1-jemalloc-test-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-jemalloc-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-jemalloc-test/mozilla/firefox-opt/dist}
-userpreferences=${userpreferences:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/prefs/test-user.js}
-extensiondir=${extensiondir:-/work/mozilla/builds/hg.mozilla.org/mozilla-central-test/testing/sisyphus/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.1}
-TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.2,debug.data

@@ -6,5 +6,5 @@ profiledirectory=${profiledirectory:-/tmp/firefox-1.9.2-profile}
 executablepath=${executablepath:-/work/mozilla/builds/1.9.2/mozilla/firefox-debug/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.2,nightly-darwin.data

@@ -0,0 +1,10 @@
+product=firefox
+branch=1.9.2
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-1.9.2/firefox-3.6a2pre.en-US.mac.dmg
+profilename=firefox-1.9.2-profile
+profiledirectory=/tmp/firefox-1.9.2-profile
+executablepath=/tmp/firefox-1.9.2
+userpreferences=${TEST_DIR}/prefs/test-user.js
+extensiondir=${TEST_DIR}/xpi
+buildtype=nightly
+TEST_MOZILLA_HG=http://hg.mozilla.org/releases/mozilla-1.9.2

mozilla/testing/sisyphus/data/firefox,1.9.2,nightly-linux.data

@@ -0,0 +1,10 @@
+product=firefox
+branch=1.9.2
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-1.9.2/firefox-3.6a2pre.en-US.linux-i686.tar.bz2
+profilename=firefox-1.9.2-profile
+profiledirectory=/tmp/firefox-1.9.2-profile
+executablepath=/tmp/firefox-1.9.2
+userpreferences=${TEST_DIR}/prefs/test-user.js
+extensiondir=${TEST_DIR}/xpi
+buildtype=nightly
+TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central

mozilla/testing/sisyphus/data/firefox,1.9.2,nightly-nt.data

@@ -0,0 +1,10 @@
+product=firefox
+branch=1.9.2
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla-1.9.2/firefox-3.6a2pre.en-US.linux-i686.tar.bz2
+profilename=firefox-1.9.2-profile
+profiledirectory=/tmp/firefox-1.9.2-profile
+executablepath=/tmp/firefox-1.9.2
+userpreferences=${TEST_DIR}/prefs/test-user.js
+extensiondir=${TEST_DIR}/xpi
+buildtype=nightly
+TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central

mozilla/testing/sisyphus/data/firefox,1.9.2,opt.data

@@ -6,5 +6,5 @@ profiledirectory=${profiledirectory:-/tmp/firefox-1.9.2-profile}
 executablepath=${executablepath:-/work/mozilla/builds/1.9.2/mozilla/firefox-opt/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.2-test,debug.data

@@ -6,5 +6,5 @@ profiledirectory=${profiledirectory:-/tmp/firefox-1.9.2-test-profile}
 executablepath=${executablepath:-/work/mozilla/builds/1.9.2-test/mozilla/firefox-debug/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.2-test,opt.data

@@ -6,5 +6,5 @@ profiledirectory=${profiledirectory:-/tmp/firefox-1.9.2-test-profile}
 executablepath=${executablepath:-/work/mozilla/builds/1.9.2-test/mozilla/firefox-opt/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/firefox,1.9.3,nightly-darwin.data

@@ -0,0 +1,10 @@
+product=firefox
+branch=1.9.3
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.7a1pre.en-US.mac.dmg
+profilename=firefox-1.9.3-profile
+profiledirectory=/tmp/firefox-1.9.3-profile
+executablepath=/tmp/firefox-1.9.3
+userpreferences=${TEST_DIR}/prefs/test-user.js
+extensiondir=${TEST_DIR}/xpi
+buildtype=nightly
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}

mozilla/testing/sisyphus/data/firefox,1.9.3,nightly-linux.data

@@ -0,0 +1,10 @@
+product=firefox
+branch=1.9.3
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.7a1pre.en-US.linux-i686.tar.bz2
+profilename=firefox-1.9.3-profile
+profiledirectory=/tmp/firefox-1.9.3-profile
+executablepath=/tmp/firefox-1.9.3
+userpreferences=${TEST_DIR}/prefs/test-user.js
+extensiondir=${TEST_DIR}/xpi
+buildtype=nightly
+TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central

mozilla/testing/sisyphus/data/firefox,1.9.3,nightly-nt.data

@@ -0,0 +1,10 @@
+product=firefox
+branch=1.9.3
+url=http://ftp.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.7a1pre.en-US.win32.zip
+profilename=firefox-1.9.3-profile
+profiledirectory=/tmp/firefox-1.9.3-profile
+executablepath=/tmp/firefox-1.9.3
+userpreferences=${TEST_DIR}/prefs/test-user.js
+extensiondir=${TEST_DIR}/xpi
+buildtype=nightly
+TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central

mozilla/testing/sisyphus/data/firefox,1.9.3-tracemonkey,debug.data

@@ -1,9 +1,9 @@
 product=${product:-firefox}
-branch=${branch:-1.9.1}
+branch=${branch:-1.9.3}
 buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.1-tracemonkey-profile}
+profilename=${profilename:-firefox-1.9.3-tracemonkey-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-tracemonkey-profile}
+profiledirectory=${profiledirectory:-/tmp/firefox-1.9.3-tracemonkey-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-tracemonkey/mozilla/firefox-debug/dist}
+executablepath=${executablepath:-/work/mozilla/builds/1.9.3-tracemonkey/mozilla/firefox-debug/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
 TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/tracemonkey}

mozilla/testing/sisyphus/data/firefox,1.9.3-tracemonkey,opt.data

@@ -1,9 +1,9 @@
 product=${product:-firefox}
-branch=${branch:-1.9.1}
+branch=${branch:-1.9.3}
 buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.1-tracemonkey-profile}
+profilename=${profilename:-firefox-1.9.3-tracemonkey-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-tracemonkey-profile}
+profiledirectory=${profiledirectory:-/tmp/firefox-1.9.3-tracemonkey-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-tracemonkey/mozilla/firefox-opt/dist}
+executablepath=${executablepath:-/work/mozilla/builds/1.9.3-tracemonkey/mozilla/firefox-opt/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
 TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/tracemonkey}

mozilla/testing/sisyphus/data/firefox,1.9.3-tracemonkey-test,debug.data

@@ -1,9 +1,9 @@
 product=${product:-firefox}
-branch=${branch:-1.9.1}
+branch=${branch:-1.9.3}
 buildtype=${buildtype:-debug}
-profilename=${profilename:-firefox-1.9.1-tracemonkey-test-profile}
+profilename=${profilename:-firefox-1.9.3-tracemonkey-test-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-tracemonkey-test-profile}
+profiledirectory=${profiledirectory:-/tmp/firefox-1.9.3-tracemonkey-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-tracemonkey-test/mozilla/firefox-debug/dist}
+executablepath=${executablepath:-/work/mozilla/builds/1.9.3-tracemonkey-test/mozilla/firefox-debug/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
 TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/tracemonkey}

mozilla/testing/sisyphus/data/firefox,1.9.3-tracemonkey-test,opt.data

@@ -1,9 +1,9 @@
 product=${product:-firefox}
-branch=${branch:-1.9.1}
+branch=${branch:-1.9.3}
 buildtype=${buildtype:-opt}
-profilename=${profilename:-firefox-1.9.1-tracemonkey-test-profile}
+profilename=${profilename:-firefox-1.9.3-tracemonkey-test-profile}
-profiledirectory=${profiledirectory:-/tmp/firefox-1.9.1-tracemonkey-test-profile}
+profiledirectory=${profiledirectory:-/tmp/firefox-1.9.3-tracemonkey-test-profile}
-executablepath=${executablepath:-/work/mozilla/builds/1.9.1-tracemonkey-test/mozilla/firefox-opt/dist}
+executablepath=${executablepath:-/work/mozilla/builds/1.9.3-tracemonkey-test/mozilla/firefox-opt/dist}
 userpreferences=${userpreferences:-/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js}
 extensiondir=${extensiondir:-/work/mozilla/mozilla.com/test.mozilla.com/www/xpi}
 TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/tracemonkey}

mozilla/testing/sisyphus/data/js,1.9.2,debug.data

@@ -2,5 +2,5 @@ product=${product:-js}
 branch=${branch:-1.9.2}
 buildtype=${buildtype:-debug}
 jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.2/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/js,1.9.2,opt.data

@@ -2,5 +2,5 @@ product=${product:-js}
 branch=${branch:-1.9.2}
 buildtype=${buildtype:-opt}
 jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.2/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/js,1.9.2-narcissus,debug.data

@@ -2,6 +2,6 @@ product=${product:-js}
 branch=${branch:-1.9.2}
 buildtype=${buildtype:-debug}
 jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.2-narcissus/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}
 NARCISSUS=${narcissuspath:-/work/mozilla/builds/1.9.2-narcissus/mozilla/js/narcissus/js.js}

mozilla/testing/sisyphus/data/js,1.9.2-narcissus,opt.data

@@ -2,6 +2,6 @@ product=${product:-js}
 branch=${branch:-1.9.2}
 buildtype=${buildtype:-opt}
 jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.2-narcissus/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}
 NARCISSUS=${narcissuspath:-/work/mozilla/builds/1.9.2-narcissus/mozilla/js/narcissus/js.js}

mozilla/testing/sisyphus/data/js,1.9.2-test,debug.data

@@ -2,5 +2,5 @@ product=${product:-js}
 branch=${branch:-1.9.2}
 buildtype=${buildtype:-debug}
 jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.2-test/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/js,1.9.2-test,opt.data

@@ -0,0 +1,6 @@
+product=${product:-js}
+branch=${branch:-1.9.2}
+buildtype=${buildtype:-opt}
+jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.2-test/mozilla/js/src}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/releases/mozilla-1.9.2}
+TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/js,1.9.3,debug.data

@@ -1,6 +1,6 @@
 product=${product:-js}
-branch=${branch:-1.9.1}
+branch=${branch:-1.9.3}
 buildtype=${buildtype:-debug}
-jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.1-actionmonkey/mozilla/js/src}
+jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.3/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/actionmonkey}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

mozilla/testing/sisyphus/data/js,1.9.3,opt.data

@@ -1,6 +1,6 @@
 product=${product:-js}
-branch=${branch:-1.9.1}
+branch=${branch:-1.9.3}
 buildtype=${buildtype:-opt}
-jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.1-actionmonkey/mozilla/js/src}
+jsshellsourcepath=${jsshellsourcepath:-/work/mozilla/builds/1.9.3/mozilla/js/src}
-TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/actionmonkey}
+TEST_MOZILLA_HG=${TEST_MOZILLA_HG:-http://hg.mozilla.org/mozilla-central}
 TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}