From 42ca1d03de74092c10edf39e21cc3fd405f4dbce Mon Sep 17 00:00:00 2001
From: "bclary@bclary.com" <bclary@bclary.com>
Date: Thu, 5 Jul 2007 09:36:55 -0700
Subject: [PATCH] Sisyphus - support buildbot, js test automation, work in
 progress. Bug 386992, not part of the build

---
 testing/sisyphus/bin/build.sh                 |   2 +-
 testing/sisyphus/bin/builder.sh               |  12 +-
 testing/sisyphus/bin/edit-talkback.sh         |  46 ++--
 testing/sisyphus/bin/install-build.sh         |  49 ++--
 testing/sisyphus/bin/library.sh               | 231 ++++++++++++------
 testing/sisyphus/bin/set-build-env.sh         | 158 ++++++------
 testing/sisyphus/bin/test-setup.sh            |  41 +++-
 testing/sisyphus/bin/tester.sh                |   7 +-
 ...ownload-check,firefox-1.5.0-ftp,linux.data |   3 +-
 .../download-check,firefox-1.5.0-ftp,mac.data |   3 +-
 ...ownload-check,firefox-1.5.0-ftp,win32.data |   3 +-
 ...ownload-check,firefox-2.0.0-ftp,linux.data |   3 +-
 .../download-check,firefox-2.0.0-ftp,mac.data |   3 +-
 ...ownload-check,firefox-2.0.0-ftp,win32.data |   3 +-
 .../download-check,firefox-all,linux.data     |   3 +-
 .../data/download-check,firefox-all,mac.data  |   3 +-
 .../download-check,firefox-all,win32.data     |   3 +-
 ...ownload-check,firefox-all-older,linux.data |   3 +-
 .../download-check,firefox-all-older,mac.data |   3 +-
 ...ownload-check,firefox-all-older,win32.data |   3 +-
 ...oad-check,thunderbird-1.5.0-ftp,linux.data |   3 +-
 ...nload-check,thunderbird-1.5.0-ftp,mac.data |   3 +-
 ...oad-check,thunderbird-1.5.0-ftp,win32.data |   3 +-
 ...oad-check,thunderbird-2.0.0-ftp,linux.data |   7 +-
 ...nload-check,thunderbird-2.0.0-ftp,mac.data |   7 +-
 ...oad-check,thunderbird-2.0.0-ftp,win32.data |   7 +-
 .../download-check,thunderbird-all,linux.data |   3 +-
 .../download-check,thunderbird-all,mac.data   |   3 +-
 .../download-check,thunderbird-all,win32.data |   3 +-
 ...oad-check,thunderbird-all-older,linux.data |   3 +-
 ...nload-check,thunderbird-all-older,mac.data |   3 +-
 ...oad-check,thunderbird-all-older,win32.data |   3 +-
 .../sisyphus/data/firefox,1.8.0,debug.data    |   3 +-
 .../data/firefox,1.8.0,nightly-linux.data     |   5 +-
 .../data/firefox,1.8.0,nightly-mac.data       |   5 +-
 .../data/firefox,1.8.0,nightly-win32.data     |   5 +-
 testing/sisyphus/data/firefox,1.8.0,opt.data  |   3 +-
 .../data/firefox,1.8.0-test,debug.data        |   3 +-
 .../sisyphus/data/firefox,1.8.0-test,opt.data |   3 +-
 .../sisyphus/data/firefox,1.8.1,debug.data    |   3 +-
 .../data/firefox,1.8.1,nightly-linux.data     |   5 +-
 .../data/firefox,1.8.1,nightly-mac.data       |   5 +-
 .../data/firefox,1.8.1,nightly-win32.data     |   5 +-
 testing/sisyphus/data/firefox,1.8.1,opt.data  |   3 +-
 .../data/firefox,1.8.1-test,debug.data        |   3 +-
 .../sisyphus/data/firefox,1.8.1-test,opt.data |   3 +-
 .../sisyphus/data/firefox,1.9.0,debug.data    |   3 +-
 .../data/firefox,1.9.0,nightly-linux.data     |   5 +-
 .../data/firefox,1.9.0,nightly-mac.data       |   5 +-
 .../data/firefox,1.9.0,nightly-win32.data     |   5 +-
 testing/sisyphus/data/firefox,1.9.0,opt.data  |   3 +-
 .../data/firefox,1.9.0-test,debug.data        |   3 +-
 .../sisyphus/data/firefox,1.9.0-test,opt.data |   3 +-
 testing/sisyphus/data/js,1.8.0,debug.data     |   2 -
 testing/sisyphus/data/js,1.8.0,opt.data       |   2 -
 .../sisyphus/data/js,1.8.0-test,debug.data    |   2 -
 testing/sisyphus/data/js,1.8.0-test,opt.data  |   2 -
 testing/sisyphus/data/js,1.8.1,debug.data     |   2 -
 testing/sisyphus/data/js,1.8.1,opt.data       |   3 -
 .../sisyphus/data/js,1.8.1-test,debug.data    |   2 -
 testing/sisyphus/data/js,1.8.1-test,opt.data  |   3 -
 testing/sisyphus/data/js,1.9.0,debug.data     |   2 -
 testing/sisyphus/data/js,1.9.0,opt.data       |   2 -
 .../sisyphus/data/js,1.9.0-test,debug.data    |   2 -
 testing/sisyphus/data/js,1.9.0-test,opt.data  |   2 -
 .../data/thunderbird,1.8.0,debug.data         |   3 +-
 .../data/thunderbird,1.8.0-test,debug.data    |   3 +-
 .../data/thunderbird,1.8.1,debug.data         |   3 +-
 .../data/thunderbird,1.8.1-test,debug.data    |   3 +-
 .../data/thunderbird,1.9.0,debug.data         |   3 +-
 .../data/thunderbird,1.9.0-test,debug.data    |   2 +
 testing/sisyphus/prefs/mail-user.js           |   1 +
 testing/sisyphus/prefs/public-user.js         |   1 +
 testing/sisyphus/prefs/test-user.js           |   1 +
 .../tests/mozilla.org/download-page/test.sh   |  27 +-
 75 files changed, 396 insertions(+), 388 deletions(-)

diff --git a/testing/sisyphus/bin/build.sh b/testing/sisyphus/bin/build.sh
index bbab5dfc6fe2..741fe632f770 100755
--- a/testing/sisyphus/bin/build.sh
+++ b/testing/sisyphus/bin/build.sh
@@ -52,7 +52,7 @@ case $product in
 	fi
 
 	case "$OSID" in
-	    "mac") 
+	    mac*) 
 		if [[ "$buildtype" == "debug" ]]; then
 		    if [[ "$product" == "firefox" ]]; then
 			executablepath=$product-$buildtype/dist/FirefoxDebug.app/Contents/MacOS
diff --git a/testing/sisyphus/bin/builder.sh b/testing/sisyphus/bin/builder.sh
index 88903a1f5fe3..c3bccc287d48 100755
--- a/testing/sisyphus/bin/builder.sh
+++ b/testing/sisyphus/bin/builder.sh
@@ -106,9 +106,9 @@ if echo "$buildcommands" | grep -iq clean; then
             for buildtype in $buildtypes; do
 
                 TEST_DATE=`date -u +%Y-%m-%d-%H-%M-%S``date +%z`
-                TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$product,$branch$extra,$buildtype,$OSID,${MACHINE},clean.log"
+                TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$product,$branch$extra,$buildtype,$OSID,${TEST_MACHINE},clean.log"
 
-                echo "writing results to $TEST_LOG"
+                echo "$TEST_LOG"
 
                 clean.sh -p $product -b $branch -T $buildtype $extraflag > $TEST_LOG 2>&1
 
@@ -123,9 +123,9 @@ if echo "$buildcommands" | grep -iq checkout; then
         for branch in $branches; do
 
             TEST_DATE=`date -u +%Y-%m-%d-%H-%M-%S``date +%z`
-            TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$product,$branch$extra,$buildtype,$OSID,${MACHINE},checkout.log"
+            TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$product,$branch$extra,$buildtype,$OSID,${TEST_MACHINE},checkout.log"
 
-            echo "writing results to $TEST_LOG"
+            echo "$TEST_LOG"
 
 
             checkout.sh -p $product -b $branch -T opt $extraflag > $TEST_LOG 2>&1
@@ -140,9 +140,9 @@ if echo "$buildcommands" | grep -iq build; then
             for buildtype in $buildtypes; do
 
                 TEST_DATE=`date -u +%Y-%m-%d-%H-%M-%S``date +%z`
-                TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$product,$branch$extra,$buildtype,$OSID,${MACHINE}-build.log"
+                TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$product,$branch$extra,$buildtype,$OSID,${TEST_MACHINE},build.log"
 
-                echo "writing results to $TEST_LOG"
+                echo "$TEST_LOG"
 
                 build.sh -p $product -b $branch -T $buildtype $extraflag > $TEST_LOG 2>&1
             done
diff --git a/testing/sisyphus/bin/edit-talkback.sh b/testing/sisyphus/bin/edit-talkback.sh
index 963f68e46ab1..bb7aa44e7eab 100755
--- a/testing/sisyphus/bin/edit-talkback.sh
+++ b/testing/sisyphus/bin/edit-talkback.sh
@@ -129,31 +129,31 @@ if [[ $talkback -eq 1 ]]; then
     if [[ ! -e master.sed ]]; then
     #echo "$0: editing talkback master.ini in `pwd`"
         cp $TEST_BIN/master.sed .
-        sed -f master.sed -ibak master.ini
-    fi
-
-    if [[ "$OSID" == "mac" ]]; then
-        vendorid=`grep '^VendorID = "' master.ini | sed 's@VendorID = "\([^"]*\)"@\1@'`
-        productid=`grep '^ProductID = "' master.ini | sed 's@ProductID = "\([^"]*\)"@\1@'`
-        platformid=`grep '^PlatformID = "' master.ini | sed 's@PlatformID = "\([^"]*\)"@\1@'`
-        buildid=`grep '^BuildID = "' master.ini | sed 's@BuildID = "\([^"]*\)"@\1@'`
-    else
-        vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
-        productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
-        platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
-        buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
+        sed -f master.sed -i.bak master.ini
     fi
 
     case $OSID in
-        "win32")
+        win32)
+            vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
+            productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
+            platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
+            buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
             appdata=`cygpath -a -d "$APPDATA"`
             talkbackdir="`cygpath -a -u $appdata`/Talkback"
             ;;
-        "linux")
+        linux)
+            vendorid=`dos2unix < master.ini | grep '^VendorID = "' | sed 's@VendorID = "\([^"]*\)"@\1@'`
+            productid=`dos2unix < master.ini | grep '^ProductID = "' | sed 's@ProductID = "\([^"]*\)"@\1@'`
+            platformid=`dos2unix < master.ini | grep '^PlatformID = "' | sed 's@PlatformID = "\([^"]*\)"@\1@'`
+            buildid=`dos2unix < master.ini | grep '^BuildID = "' | sed 's@BuildID = "\([^"]*\)"@\1@'`
             talkbackdir="$HOME/.fullcircle"
             ;;
-        "mac" )
+        mac* )
             # hack around Mac's use of spaces in directory names
+            vendorid=`grep '^VendorID = "' master.ini | sed 's@VendorID = "\([^"]*\)"@\1@'`
+            productid=`grep '^ProductID = "' master.ini | sed 's@ProductID = "\([^"]*\)"@\1@'`
+            platformid=`grep '^PlatformID = "' master.ini | sed 's@PlatformID = "\([^"]*\)"@\1@'`
+            buildid=`grep '^BuildID = "' master.ini | sed 's@BuildID = "\([^"]*\)"@\1@'`
             talkbackdir="$HOME/Library/Application Support/FullCircle"
             IFS=:
             ;;
@@ -172,7 +172,7 @@ if [[ $talkback -eq 1 ]]; then
         win32)
             talkbackinidir="$talkbackdir/$vendorid/$productid/$platformid/$buildid"
             ;;
-        "linux" | "mac" )
+        linux | mac* )
             talkbackinidir="$talkbackdir/$vendorid$productid$platformid$buildid"
             ;;
     esac
@@ -186,14 +186,14 @@ if [[ $talkback -eq 1 ]]; then
     cp /work/mozilla/mozilla.com/test.mozilla.com/www/talkback/$OSID/Talkback.ini .
 
     case "$OSID" in
-        "win32")
-            sed -ibak "s@URLEdit .*@URLEdit = \"mozqa:$talkbackid\"@" Talkback.ini
+        win32)
+            sed -i.bak "s@URLEdit .*@URLEdit = \"mozqa:$talkbackid\"@" Talkback.ini
             ;;
-        "linux" )
-            sed -ibak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini
+        linux )
+            sed -i.bak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini
             ;;
-        "mac" )
-            sed -ibak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini
+        mac* )
+            sed -i.bak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini
             ;;
         *)
             error "unknown os=$OSID"
diff --git a/testing/sisyphus/bin/install-build.sh b/testing/sisyphus/bin/install-build.sh
index 7680c6e23c4a..48ca745d908f 100755
--- a/testing/sisyphus/bin/install-build.sh
+++ b/testing/sisyphus/bin/install-build.sh
@@ -116,37 +116,38 @@ if [[ $OSID == "win32" ]]; then
 
 else
     
-    if [[ $OSID == "linux" ]]; then
+    case "$OSID" in
+        linux)
+            if echo $filetype | grep -iq 'bzip2'; then
+                tar -jxvf $filename -C "$executablepath"
+            elif echo $filetype | grep -iq 'gzip'; then
+                tar -zxvf $filename -C "$executablepath" 
+            else
+                error "unknown file type $filetype"
+            fi
+            ;; 
 
-	    if echo $filetype | grep -iq 'bzip2'; then
-	        tar -jxvf $filename -C "$executablepath"
-	    elif echo $filetype | grep -iq 'gzip'; then
-	        tar -zxvf $filename -C "$executablepath" 
-	    else
-	        error "unknown file type $filetype"
-	    fi
-
-    elif [[ $OSID == "mac" ]]; then
+        mac*)
         # answer license prompt
-        result=`${TEST_BIN}/hdiutil-expect.ex $filename`
+            result=`${TEST_BIN}/hdiutil-expect.ex $filename`
         # now get the volume data
 	    #result=`hdiutil attach $filename`
-	    disk=`echo $result | sed 's@.*\(/dev/[^ ]*\).*/dev.*/dev.*@\1@'`
+            disk=`echo $result | sed 's@.*\(/dev/[^ ]*\).*/dev.*/dev.*@\1@'`
         # remove the carriage return inserted by expect
-	    volume=`echo $result | sed "s|[^a-zA-Z0-9/]||g" | sed 's@.*\(/Volumes/.*\)@\1@'`
-	    echo "disk=$disk"
-	    echo "volume=$volume"
-	    if [[ -z "$disk" || -z "$volume" ]]; then
-	        error "mounting disk image: $result"
-	    fi
+            volume=`echo $result | sed "s|[^a-zA-Z0-9/]||g" | sed 's@.*\(/Volumes/.*\)@\1@'`
+            echo "disk=$disk"
+            echo "volume=$volume"
+            if [[ -z "$disk" || -z "$volume" ]]; then
+                error "mounting disk image: $result"
+            fi
 
-        for app in $volume/*.app; do
-            cp -R $app $executablepath
-        done
+            for app in $volume/*.app; do
+                cp -R $app $executablepath
+            done
 
-	    hdiutil detach $disk
-
-    fi
+            hdiutil detach $disk
+            ;;
+    esac
 
     #
     # patch unix-like startup scripts to exec instead of 
diff --git a/testing/sisyphus/bin/library.sh b/testing/sisyphus/bin/library.sh
index 709ea1ebc2be..34e23c50ae96 100755
--- a/testing/sisyphus/bin/library.sh
+++ b/testing/sisyphus/bin/library.sh
@@ -1,4 +1,4 @@
-# -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*-
+# -*- Mode: Shell-script; tab-width: 2; indent-tabs-mode: nil; -*-
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
@@ -44,124 +44,193 @@
 # TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
 # source ${TEST_BIN}/library.sh
 #
+#trap "echo error $0 `caller 1`; exit" ERR
 
-echo "calling $0 $@"
+# skip remainder of script if it has already 
+# included
+
+if [[ -n "$DEBUG" ]]; then
+    echo "calling $0 $@" 1>&2
+fi
+
+if [[ -z "$LIBRARYSH" ]]; then
+    LIBRARYSH=1
 
 # export variables
-set -a 
+    set -a 
+
+# make pipelines return exit code of intermediate steps
+# requires bash 3.x
+    set -o pipefail 
+
+# set time format for pipeline timing reports
+    TIMEFORMAT="Elapsed time %0R seconds, User %0U seconds, System %0S seconds, CPU %P%%"
+
+    MALLOC_CHECK_=2
+
+    ulimit -c 0
+
+# debug msg
+#
+# output debugging message to stdout if $DEBUG is set
+
+    DEBUG=${DEBUG:-""}
+
+    debug()
+    {
+        if [[ -n "$DEBUG" ]]; then
+            echo "DEBUG: $@"
+        fi
+    }
+
+# console msg
+#
+# output message to console, ie. stderr
+
+    console()
+    {
+        echo "$@" 1>&2
+    }
+
 
 # error message
 # output error message end exit 2
 
-error()
-{
-    echo "error in script $SCRIPT: $1"
-    if [[ "$0" == "-bash" || "$0" == "bash" ]]; then
-        return 0
-    fi
-    exit 2
-} 
+    error()
+    {
+        echo "error in script $SCRIPT: $1"
+        if [[ "$0" == "-bash" || "$0" == "bash" ]]; then
+            return 0
+        fi
+        exit 2
+    } 
+
+# dumpenvironment
+#
+# output environment to stdout
+
+    dumpenvironment()
+    {
+        set | grep '^[A-Z]' | sed 's|^|environment: |'
+    }
+
+# dumpvars varname1, ...
+#
+# dumps name=value pairs to stdout for each variable named 
+# in argument list
+
+    dumpvars()
+    {
+        local argc=$#
+        local argn=1
+
+        while [ $argn -le $argc ]; do
+            local var=${!argn}
+            echo ${var}=${!var}
+            let argn=argn+1
+        done
+    }
 
 # get_executable product branch directory
+#
 # writes path to product executable to stdout
 
-get_executable()
-{
-    get_executable_product="$1"
-    get_executable_branch="$2"
-    get_executable_directory="$3"
+    get_executable()
+    {
+        get_executable_product="$1"
+        get_executable_branch="$2"
+        get_executable_directory="$3"
 
-    if [[ -z "$get_executable_product" || \
-        -z "$get_executable_branch" || \
-        -z "$get_executable_directory" ]]; then
-        error "usage: get_executable product branch directory"
-    elif [[ ! -d "$get_executable_directory" ]]; then
-        error "get_executable: executable directory \"$get_executable_directory\" does not exist"
-    else
+        if [[ -z "$get_executable_product" || \
+            -z "$get_executable_branch" || \
+            -z "$get_executable_directory" ]]; then
+            error "usage: get_executable product branch directory"
+        elif [[ ! -d "$get_executable_directory" ]]; then
+            error "get_executable: executable directory \"$get_executable_directory\" does not exist"
+        else
         # should use /u+x,g+x,a+x but mac os x uses an obsolete find
         # filter the output to remove extraneous file in dist/bin for
         # cvs builds on mac os x.
-        get_executable_name="$get_executable_product${EXE_EXT}"
-        if [[ "$OSID" == "mac" ]]; then
-            get_executable_filter="Contents/MacOS/$get_executable_product"
-            if [[ "$get_executable_product" == "thunderbird" ]]; then
-                get_executable_name="$get_executable_product-bin"
+            get_executable_name="$get_executable_product${EXE_EXT}"
+            case "$OSID" in
+                mac*)
+                    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"
+            esac
+            if find "$get_executable_directory" -perm +111 -type f \
+                -name "$get_executable_name" | \
+                grep "$get_executable_filter"; then
+                true
             fi
-        else
-            get_executable_filter="$get_executable_product"
-        fi
-        if find "$get_executable_directory" -perm +111 -type f \
-            -name "$get_executable_name" | \
-            grep "$get_executable_filter"; then
-            true
         fi
+    }
+
+    if [[ "$0" == "-bash" || "$0" == "bash" ]]; then
+        SCRIPT="library.sh"
+    else
+        SCRIPT=`basename $0`
     fi
-}
 
+    TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
+    TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
+    TEST_HTTP=${TEST_HTTP:-test.mozilla.com}
+    TEST_STARTUP_TIMEOUT=${TEST_STARTUP_TIMEOUT:-30}
 
-TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
-TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
-TEST_HTTP=${TEST_HTTP:-test.mozilla.com}
-TEST_STARTUP_TIMEOUT=${TEST_STARTUP_TIMEOUT:-30}
+    TEST_TIMEZONE=`date +%z`
+
+    TEST_MACHINE=`uname -n`
+    TEST_KERNEL=`uname -r`
+    TEST_PROCESSORTYPE=`uname -p`
 
 # set path to make life easier
-PATH=${TEST_DIR}/bin:$PATH
+    if ! echo ${PATH} | grep -q $TEST_BIN; then
+        PATH=${TEST_BIN}:$PATH
+    fi
 
-# make pipelines return exit code of intermediate steps
-# requires bash 3.x
-set -o pipefail 
-
-if [[ "$0" == "-bash" || "$0" == "bash" ]]; then
-    SCRIPT="library.sh"
-else
-    SCRIPT=`basename $0`
-fi
+    if echo $OSTYPE | grep -iq cygwin; then
+        OSID=win32
+        EXE_EXT=".exe"
+    elif echo $OSTYPE | grep -iq Linux; then
+        OSID=linux
+        EXE_EXT=
+    elif echo $OSTYPE | grep -iq darwin; then
+        OSID=mac`uname -p`
+        EXE_EXT=
+    else
+        error "Unknown OS $OSTYPE"
+    fi
 
 # save starting directory
-STARTDIR=`pwd`
+    STARTDIR=`pwd`
 
-# change working directory to the location of the script.
-SCRIPTDIR=`dirname $0`
-cd $SCRIPTDIR
-
-# set time format for pipeline timing reports
-TIMEFORMAT="Elapsed time %0R seconds, User %0U seconds, System %0S seconds, CPU %P%%"
+# location of the script.
+    SCRIPTDIR=`dirname $0`
 
 # don't attach to running instance
-MOZ_NO_REMOTE=1
+    MOZ_NO_REMOTE=1
 
 # don't restart
-NO_EM_RESTART=1
+    NO_EM_RESTART=1
 
 # bypass profile manager
-MOZ_BYPASS_PROFILE_AT_STARTUP=1
+    MOZ_BYPASS_PROFILE_AT_STARTUP=1
 
 # ah crap handler timeout
-MOZ_GDB_SLEEP=10
+    MOZ_GDB_SLEEP=10
 
 # no dialogs on asserts
-XPCOM_DEBUG_BREAK=warn
+    XPCOM_DEBUG_BREAK=warn
+
+# no airbag
+    unset MOZ_AIRBAG
+    MOZ_CRASHREPORTER_DISABLE=1
 
 #leak gauge
 #NSPR_LOG_MODULES=DOMLeak:5,DocumentLeak:5,nsDocShellLeak:5
 
-MALLOC_CHECK_=2
-
-MACHINE=`uname -n`
-
-ulimit -c 0
-
-if echo $OSTYPE | grep -iq cygwin; then
-    OSID=win32
-    EXE_EXT=".exe"
-elif echo $OSTYPE | grep -iq Linux; then
-    OSID=linux
-    EXE_EXT=
-elif echo $OSTYPE | grep -iq darwin; then
-    OSID=mac
-    EXE_EXT=
-else
-    error "Unknown OS $OSTYPE"
 fi
-
-
diff --git a/testing/sisyphus/bin/set-build-env.sh b/testing/sisyphus/bin/set-build-env.sh
index b521cd453e69..f7ab479705c7 100755
--- a/testing/sisyphus/bin/set-build-env.sh
+++ b/testing/sisyphus/bin/set-build-env.sh
@@ -69,12 +69,12 @@ myexit()
     myexit_status=$1
 
     case $0 in
-	*bash*)
+        *bash*)
 	  # prevent "sourced" script calls from 
           # exiting the current shell.
-	    break 99;;
-	*)
-	    exit $myexit_status;;
+            break 99;;
+        *)
+            exit $myexit_status;;
     esac
 }
 
@@ -85,82 +85,68 @@ for step in step1; do # dummy loop for handling exits
     while getopts $options optname ; 
       do 
       case $optname in
-	  p) product=$OPTARG;;
-	  b) branch=$OPTARG;;
-	  T) buildtype=$OPTARG;;
-	  e) extra=$OPTARG;;
+          p) product=$OPTARG;;
+          b) branch=$OPTARG;;
+          T) buildtype=$OPTARG;;
+          e) extra=$OPTARG;;
       esac
     done
 
 # echo product=$product, branch=$branch, buildtype=$buildtype, extra=$extra
 
     if [[ -z "$product" || -z "$branch" || -z "$buildtype" ]]; then
-	echo -n "missing"
-	if [[ -z "$product" ]]; then
-	    echo -n " -p product"
-	fi
-	if [[ -z "$branch" ]]; then
-	    echo -n " -b branch"
-	fi
-	if [[ -z "$buildtype" ]]; then
-	    echo -n " -T buildtype"
-	fi
-	usage
-	myexit 2
+        echo -n "missing"
+        if [[ -z "$product" ]]; then
+            echo -n " -p product"
+        fi
+        if [[ -z "$branch" ]]; then
+            echo -n " -b branch"
+        fi
+        if [[ -z "$buildtype" ]]; then
+            echo -n " -T buildtype"
+        fi
+        usage
+        myexit 2
     fi
 
     if [[ $branch == "1.8.0" ]]; then
-	export BRANCH_CO_FLAGS="-r MOZILLA_1_8_0_BRANCH"
+        export BRANCH_CO_FLAGS="-r MOZILLA_1_8_0_BRANCH"
     elif [[ $branch == "1.8.1" ]]; then
-	export BRANCH_CO_FLAGS="-r MOZILLA_1_8_BRANCH"
+        export BRANCH_CO_FLAGS="-r MOZILLA_1_8_BRANCH"
     elif [[ $branch == "1.9.0" ]]; then
-	export BRANCH_CO_FLAGS="";
+        export BRANCH_CO_FLAGS="";
     else
-	echo "Unknown branch: $branch"
-	myexit 2
+        echo "Unknown branch: $branch"
+        myexit 2
     fi
 
     if [[ -n "$WINDIR" ]] ; then
-	OSID=win32
+        OSID=win32
 #	app=bin
-	export platform=i686
+        export platform=i686
 
-	if echo $branch | egrep -q '^1\.8'; then
-	    export MOZ_TOOLS="/work/mozilla/moztools"
-	    source /work/mozilla/mozilla.com/test.mozilla.com/www/bin/set-msvc6-env.sh
-	else
-	    export MOZ_TOOLS="/work/mozilla/moztools-static"
-	    source /work/mozilla/mozilla.com/test.mozilla.com/www/bin/set-msvc8-env.sh
-	fi
+        if echo $branch | egrep -q '^1\.8'; then
+            export MOZ_TOOLS="/work/mozilla/moztools"
+            source /work/mozilla/mozilla.com/test.mozilla.com/www/bin/set-msvc6-env.sh
+        else
+            export MOZ_TOOLS="/work/mozilla/moztools-static"
+            source /work/mozilla/mozilla.com/test.mozilla.com/www/bin/set-msvc8-env.sh
+        fi
 
-	echo moztools Location: $MOZ_TOOLS
+        echo moztools Location: $MOZ_TOOLS
 
     elif uname | grep -iq darwin ; then
-	OSID=mac
-	export platform=`uname -p`
-#	if [[ "$product" == "firefox" ]]; then
-#	    app=Firefox
-#	elif [[ "$product" == "thunderbird" ]]; then
-#	    app=Thunderbird
-#	else
-#	    echo "Unsupported product: $product"
-#	    myexit 2
-#	fi
-#	if [[ "$buildtype" == "debug" ]]; then
-#	    app="${app}Debug"
-#	fi
-#	app="${app}.app"
-#	export APPBIN="$app/Content/MacOS"
+        OSID=mac
+        export platform=`uname -p`
     else
-	OSID=linux
-#	export APPBIN=bin
-	export platform=i686
+        OSID=linux
+        export platform=i686
     fi
 
     if [[ -z $extra ]]; then
-	export TREE="$BUILDDIR/$branch"
+        export TREE="$BUILDDIR/$branch"
     else
-	export TREE="$BUILDDIR/$branch-$extra"
+        export TREE="$BUILDDIR/$branch-$extra"
 
 	#
 	# extras can't be placed in mozconfigs since not all parts
@@ -169,54 +155,56 @@ for step in step1; do # dummy loop for handling exits
 	# requiring separate source trees
 	#
 
-	if [[ "$extra" == "too-much-gc" ]]; then
-	    export XCFLAGS="-DWAY_TOO_MUCH_GC=1"
-	    export CFLAGS="-DWAY_TOO_MUCH_GC=1"
-	    export CXXFLAGS="-DWAY_TOO_MUCH_GC=1"
-	elif [[ "$extra" == "gcov" ]]; then
+        if [[ "$extra" == "too-much-gc" ]]; then
+            export XCFLAGS="-DWAY_TOO_MUCH_GC=1"
+            export CFLAGS="-DWAY_TOO_MUCH_GC=1"
+            export CXXFLAGS="-DWAY_TOO_MUCH_GC=1"
+        elif [[ "$extra" == "gcov" ]]; then
 
-	    if [[ "$OSID" == "win32" ]]; then
-		echo "win32 does not support gcov"
-		myexit 2
-	    fi
-	    export CFLAGS="--coverage"
-	    export CXXFLAGS="--coverage"
-	    export XCFLAGS="--coverage"
-	    export OS_CFLAGS="--coverage"
-	    export LDFLAGS="--coverage"
-	    export XLDOPTS="--coverage"	
-	fi
+            if [[ "$OSID" == "win32" ]]; then
+                echo "win32 does not support gcov"
+                myexit 2
+            fi
+            export CFLAGS="--coverage"
+            export CXXFLAGS="--coverage"
+            export XCFLAGS="--coverage"
+            export OS_CFLAGS="--coverage"
+            export LDFLAGS="--coverage"
+            export XLDOPTS="--coverage"	
+        fi
     fi
 
     if [[ ! -d $TREE ]]; then
-	echo "Build directory $TREE does not exist"
-	myexit 2
+        echo "Build directory $TREE does not exist"
+        myexit 2
     fi
 
     # here project refers to either browser or mail
     # and is used to find mozilla/(browser|mail)/config/mozconfig
     if [[ $product == "firefox" ]]; then
-	project=browser
-	export MOZCONFIG="$TREE/mozconfig-firefox-$OSID-$platform-$buildtype"
+        project=browser
+        export MOZCONFIG="$TREE/mozconfig-firefox-$OSID-$platform-$buildtype"
     elif [[ $product == "thunderbird" ]]; then
-	project=mail
-	export MOZCONFIG="$TREE/mozconfig-thunderbird-$OSID-$platform-$buildtype"
+        project=mail
+        export MOZCONFIG="$TREE/mozconfig-thunderbird-$OSID-$platform-$buildtype"
     else
-	echo "Assuming project=browser for product: $product"
-	project=browser
-	export MOZCONFIG="$TREE/mozconfig-firefox-$OSID-$platform-$buildtype"
+        echo "Assuming project=browser for product: $product"
+        project=browser
+        export MOZCONFIG="$TREE/mozconfig-firefox-$OSID-$platform-$buildtype"
     fi
 
     # js shell builds
     if [[ $buildtype == "debug" ]]; then
-	unset BUILD_OPT
+        unset BUILD_OPT
     else
-	export BUILD_OPT=1
+        export BUILD_OPT=1
     fi
 
-    if [[ $OSID == "mac" ]]; then
-	export JS_EDITLINE=1 # required for mac
-    fi
+    case "$OSID" in
+        mac)
+            export JS_EDITLINE=1 # required for mac
+            ;;
+    esac
     # end js shell builds
 
     set | sed 's/^/environment: /'
diff --git a/testing/sisyphus/bin/test-setup.sh b/testing/sisyphus/bin/test-setup.sh
index 0dfc1e52a5b3..b211837eea78 100755
--- a/testing/sisyphus/bin/test-setup.sh
+++ b/testing/sisyphus/bin/test-setup.sh
@@ -137,6 +137,19 @@ if [[ -n "$datafiles" ]]; then
     done
 fi
 
+TEST_PRODUCT=$product
+TEST_BRANCH=$branch
+TEST_BUILDCOMMANDS=$buildcommands
+TEST_BUILDTYPE=$buildtype
+TEST_EXECUTABLEPATH=$executablepath
+TEST_PROFILENAME=$profilename
+TEST_PROFILETEMPLATE=$profiletemplate
+TEST_USERPREFERENCES=$userpreferences
+TEST_EXTENSIONDIR=$extensiondir
+TEST_DATAFILES=$datafiles
+
+dumpenvironment
+
 if [[ -z "$product" || -z "$branch" ]]; then
     echo "product and branch are required"
     usage
@@ -190,19 +203,21 @@ if [[ -n "$buildcommands" ]]; then
         usage
     fi
 
-    if [[ "$OSID" == "mac" ]]; then
-        if [[ "$product" == "firefox" ]]; then
-            App=Firefox
-        elif [[ "$product" == "thunderbird" ]]; then
-            App=Thunderbird
-        fi
-        if [[ "$buildtype" == "debug" ]]; then
-            AppType=Debug
-        fi
-        executablepath="/work/mozilla/builds/$branch/mozilla/$product-$buildtype/dist/$App$AppType.app/Contents/MacOS"
-    else
-        executablepath="/work/mozilla/builds/$branch/mozilla/$product/$buildtype/dist/bin"
-    fi
+    case "$OSID" in
+        mac*)
+            if [[ "$product" == "firefox" ]]; then
+                App=Firefox
+            elif [[ "$product" == "thunderbird" ]]; then
+                App=Thunderbird
+            fi
+            if [[ "$buildtype" == "debug" ]]; then
+                AppType=Debug
+            fi
+            executablepath="/work/mozilla/builds/$branch/mozilla/$product-$buildtype/dist/$App$AppType.app/Contents/MacOS"
+            ;;
+        *)
+            executablepath="/work/mozilla/builds/$branch/mozilla/$product/$buildtype/dist/bin"
+    esac
 
     if echo "$buildcommands" | grep -iq clean; then
         clean.sh -p $product -b $branch -t $buildtype
diff --git a/testing/sisyphus/bin/tester.sh b/testing/sisyphus/bin/tester.sh
index 239177ea4f0f..74f28ac2c9a4 100755
--- a/testing/sisyphus/bin/tester.sh
+++ b/testing/sisyphus/bin/tester.sh
@@ -93,13 +93,14 @@ shift 2
 
 datalist=`combo.sh "$@"`
 
-TEST_ID=`dirname $testscript | sed "s|$TEST_DIR/||" | sed "s|/|_|g"`
+TEST_SUITE=`dirname $testscript | sed "s|$TEST_DIR/||" | sed "s|/|_|g"`
 
 for data in $datalist; do
     TEST_DATE=`date -u +%Y-%m-%d-%H-%M-%S``date +%z`
-    TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$data,$OSID,${MACHINE},$TEST_ID.log"
+    TEST_LOG="${TEST_DIR}/results/${TEST_DATE},$data,$OSID,${TEST_MACHINE},$TEST_SUITE.log"
 
-    echo "writing results to $TEST_LOG"
+    # tell caller what the log files are
+    echo "$TEST_LOG "
 
     test-setup.sh -d $TEST_DIR/data/$data.data >> $TEST_LOG 2>&1
 
diff --git a/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,linux.data b/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,linux.data
index 2848575b1101..3a344260f873 100755
--- a/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,linux.data
+++ b/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,mac.data b/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,mac.data
index 0dadcad53686..4a7b1b619f9d 100755
--- a/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,mac.data
+++ b/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,win32.data b/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,win32.data
index a843b4d15e4b..18ef125d1a52 100755
--- a/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,win32.data
+++ b/testing/sisyphus/data/download-check,firefox-1.5.0-ftp,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,linux.data b/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,linux.data
index 84e2a2276114..6d8b4754b1d8 100755
--- a/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,linux.data
+++ b/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,mac.data b/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,mac.data
index 52803fc9b689..ec1fad73076c 100755
--- a/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,mac.data
+++ b/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,win32.data b/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,win32.data
index f280b53d5c26..58a85659ab04 100755
--- a/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,win32.data
+++ b/testing/sisyphus/data/download-check,firefox-2.0.0-ftp,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-all,linux.data b/testing/sisyphus/data/download-check,firefox-all,linux.data
index fa29a8fe8c43..56dc91dc6d7e 100755
--- a/testing/sisyphus/data/download-check,firefox-all,linux.data
+++ b/testing/sisyphus/data/download-check,firefox-all,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-all,mac.data b/testing/sisyphus/data/download-check,firefox-all,mac.data
index 32fdc2660b0e..a6e9c5f1f6fe 100755
--- a/testing/sisyphus/data/download-check,firefox-all,mac.data
+++ b/testing/sisyphus/data/download-check,firefox-all,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-all,win32.data b/testing/sisyphus/data/download-check,firefox-all,win32.data
index 1e5886251bb9..fe2f7c953619 100755
--- a/testing/sisyphus/data/download-check,firefox-all,win32.data
+++ b/testing/sisyphus/data/download-check,firefox-all,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-all-older,linux.data b/testing/sisyphus/data/download-check,firefox-all-older,linux.data
index fc533ac41fa5..f55c1e4460fc 100755
--- a/testing/sisyphus/data/download-check,firefox-all-older,linux.data
+++ b/testing/sisyphus/data/download-check,firefox-all-older,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-all-older,mac.data b/testing/sisyphus/data/download-check,firefox-all-older,mac.data
index 5c198e538777..a2378558dca8 100755
--- a/testing/sisyphus/data/download-check,firefox-all-older,mac.data
+++ b/testing/sisyphus/data/download-check,firefox-all-older,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,firefox-all-older,win32.data b/testing/sisyphus/data/download-check,firefox-all-older,win32.data
index 71348bbc5a76..dce9c5c11e3c 100755
--- a/testing/sisyphus/data/download-check,firefox-all-older,win32.data
+++ b/testing/sisyphus/data/download-check,firefox-all-older,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,linux.data b/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,linux.data
index 5358c8fb930f..1e81f3b898cd 100755
--- a/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,linux.data
+++ b/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,mac.data b/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,mac.data
index 5c3167cb8e24..adc1dabbbabd 100755
--- a/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,mac.data
+++ b/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,win32.data b/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,win32.data
index e44784a454c1..a94fd220ed96 100755
--- a/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,win32.data
+++ b/testing/sisyphus/data/download-check,thunderbird-1.5.0-ftp,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,linux.data b/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,linux.data
index 088825c0d6e3..48b16cf7c82c 100755
--- a/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,linux.data
+++ b/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,linux.data
@@ -1,12 +1,11 @@
-allurl=http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.4-candidates/rc2/
+allurl=http://stage.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.4/
 product=firefox
 branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/linux-i686/en-US/firefox-2.0.0.3.tar.gz
+url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.4/linux-i686/en-US/firefox-2.0.0.4.tar.gz
 profilename=firefox-1.8.1-profile
 profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,mac.data b/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,mac.data
index 874545be2f99..4f99f8d4477c 100755
--- a/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,mac.data
+++ b/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,mac.data
@@ -1,12 +1,11 @@
-allurl=http://stage.mozilla.org/pub/mozilla.org/thunderbird/nightly/2.0.0.4-candidates/rc2/
+allurl=http://stage.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.4/
 product=firefox
 branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/mac/en-US/Firefox%202.0.0.3.dmg
+url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.4/mac/en-US/Firefox%202.0.0.4.dmg
 profilename=firefox-1.8.1-profile
 profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,win32.data b/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,win32.data
index 67ef9444017a..b1c36b1efb2a 100755
--- a/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,win32.data
+++ b/testing/sisyphus/data/download-check,thunderbird-2.0.0-ftp,win32.data
@@ -1,12 +1,11 @@
-allurl=http://stage.mozilla.org/pub/mozilla.org/firefox/thunderbird/2.0.0.4-candidates/rc2/
+allurl=http://stage.mozilla.org/pub/mozilla.org/thunderbird/releases/2.0.0.4/
 product=firefox
 branch=1.8.1
-url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.3/win32/en-US/Firefox%20Setup%202.0.0.3.exe
+url=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.4/win32/en-US/Firefox%20Setup%202.0.0.4.exe
 profilename=firefox-1.8.1-profile
 profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=ftp
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-all,linux.data b/testing/sisyphus/data/download-check,thunderbird-all,linux.data
index e5d20acc2eec..4d2854d6ed84 100755
--- a/testing/sisyphus/data/download-check,thunderbird-all,linux.data
+++ b/testing/sisyphus/data/download-check,thunderbird-all,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-all,mac.data b/testing/sisyphus/data/download-check,thunderbird-all,mac.data
index e3ae7bfd4fcc..5757ed4efd49 100755
--- a/testing/sisyphus/data/download-check,thunderbird-all,mac.data
+++ b/testing/sisyphus/data/download-check,thunderbird-all,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-all,win32.data b/testing/sisyphus/data/download-check,thunderbird-all,win32.data
index c2541b5b51f1..6fa75452d296 100755
--- a/testing/sisyphus/data/download-check,thunderbird-all,win32.data
+++ b/testing/sisyphus/data/download-check,thunderbird-all,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-all-older,linux.data b/testing/sisyphus/data/download-check,thunderbird-all-older,linux.data
index c089c2f8794a..0dddedf9dfaf 100755
--- a/testing/sisyphus/data/download-check,thunderbird-all-older,linux.data
+++ b/testing/sisyphus/data/download-check,thunderbird-all-older,linux.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-all-older,mac.data b/testing/sisyphus/data/download-check,thunderbird-all-older,mac.data
index 0c14b972e234..9d55f7c22474 100755
--- a/testing/sisyphus/data/download-check,thunderbird-all-older,mac.data
+++ b/testing/sisyphus/data/download-check,thunderbird-all-older,mac.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/download-check,thunderbird-all-older,win32.data b/testing/sisyphus/data/download-check,thunderbird-all-older,win32.data
index bf67e4aa1c54..03a9126836eb 100755
--- a/testing/sisyphus/data/download-check,thunderbird-all-older,win32.data
+++ b/testing/sisyphus/data/download-check,thunderbird-all-older,win32.data
@@ -8,5 +8,4 @@ executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 test=all
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.0,debug.data b/testing/sisyphus/data/firefox,1.8.0,debug.data
index 389cce6e6fa7..4f49d011e183 100755
--- a/testing/sisyphus/data/firefox,1.8.0,debug.data
+++ b/testing/sisyphus/data/firefox,1.8.0,debug.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.0-profile
 executablepath=/work/mozilla/builds/1.8.0/mozilla/firefox-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/firefox,1.8.0,nightly-linux.data b/testing/sisyphus/data/firefox,1.8.0,nightly-linux.data
index 59a5016888f6..5e288dfc94e6 100755
--- a/testing/sisyphus/data/firefox,1.8.0,nightly-linux.data
+++ b/testing/sisyphus/data/firefox,1.8.0,nightly-linux.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.8.0
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.12pre.en-US.linux-i686.tar.gz
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.13pre.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=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.0,nightly-mac.data b/testing/sisyphus/data/firefox,1.8.0,nightly-mac.data
index 5db242a51d6a..8f15023f1cd8 100755
--- a/testing/sisyphus/data/firefox,1.8.0,nightly-mac.data
+++ b/testing/sisyphus/data/firefox,1.8.0,nightly-mac.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.8.0
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.12pre.en-US.mac.dmg
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.13pre.en-US.mac.dmg
 profilename=firefox-1.8.0-profile
 profiledirectory=/tmp/firefox-1.8.0-profile
 executablepath=/tmp/firefox-1.8.0
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.0,nightly-win32.data b/testing/sisyphus/data/firefox,1.8.0,nightly-win32.data
index 41cfa512c25c..6f7d5c49cbd7 100755
--- a/testing/sisyphus/data/firefox,1.8.0,nightly-win32.data
+++ b/testing/sisyphus/data/firefox,1.8.0,nightly-win32.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.8.0
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.12pre.en-US.win32.zip
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8.0/firefox-1.5.0.13pre.en-US.win32.zip
 profilename=firefox-1.8.0-profile
 profiledirectory=/tmp/firefox-1.8.0-profile
 executablepath=/tmp/firefox-1.8.0
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.0,opt.data b/testing/sisyphus/data/firefox,1.8.0,opt.data
index 6a295b697ffb..1b2cab9ae20a 100755
--- a/testing/sisyphus/data/firefox,1.8.0,opt.data
+++ b/testing/sisyphus/data/firefox,1.8.0,opt.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.0-profile
 executablepath=/work/mozilla/builds/1.8.0/mozilla/firefox-opt/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=opt
diff --git a/testing/sisyphus/data/firefox,1.8.0-test,debug.data b/testing/sisyphus/data/firefox,1.8.0-test,debug.data
index ef964b4a87ee..45e906db28c9 100755
--- a/testing/sisyphus/data/firefox,1.8.0-test,debug.data
+++ b/testing/sisyphus/data/firefox,1.8.0-test,debug.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.0-test-profile
 executablepath=/work/mozilla/builds/1.8.0-test/mozilla/firefox-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/firefox,1.8.0-test,opt.data b/testing/sisyphus/data/firefox,1.8.0-test,opt.data
index 6ff9a003726d..8f82abf823dd 100755
--- a/testing/sisyphus/data/firefox,1.8.0-test,opt.data
+++ b/testing/sisyphus/data/firefox,1.8.0-test,opt.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.0-test-profile
 executablepath=/work/mozilla/builds/1.8.0-test/mozilla/firefox-opt/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=opt
diff --git a/testing/sisyphus/data/firefox,1.8.1,debug.data b/testing/sisyphus/data/firefox,1.8.1,debug.data
index 9e8755ac8ad7..92d2b8070207 100755
--- a/testing/sisyphus/data/firefox,1.8.1,debug.data
+++ b/testing/sisyphus/data/firefox,1.8.1,debug.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/work/mozilla/builds/1.8.1/mozilla/firefox-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/firefox,1.8.1,nightly-linux.data b/testing/sisyphus/data/firefox,1.8.1,nightly-linux.data
index 64cd4ebb9658..f7625754e460 100755
--- a/testing/sisyphus/data/firefox,1.8.1,nightly-linux.data
+++ b/testing/sisyphus/data/firefox,1.8.1,nightly-linux.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.8.1
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.4pre.en-US.linux-i686.tar.gz
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.5pre.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=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.1,nightly-mac.data b/testing/sisyphus/data/firefox,1.8.1,nightly-mac.data
index cdcc5c9696cf..212762888f1c 100755
--- a/testing/sisyphus/data/firefox,1.8.1,nightly-mac.data
+++ b/testing/sisyphus/data/firefox,1.8.1,nightly-mac.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.8.1
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.4pre.en-US.mac.dmg
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.5pre.en-US.mac.dmg
 profilename=firefox-1.8.1-profile
 profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.1,nightly-win32.data b/testing/sisyphus/data/firefox,1.8.1,nightly-win32.data
index 40c125f5dcf2..dd1c8d344ea7 100755
--- a/testing/sisyphus/data/firefox,1.8.1,nightly-win32.data
+++ b/testing/sisyphus/data/firefox,1.8.1,nightly-win32.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.8.1
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.4pre.en-US.win32.zip
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-mozilla1.8/firefox-2.0.0.5pre.en-US.win32.zip
 profilename=firefox-1.8.1-profile
 profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/tmp/firefox-1.8.1
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.8.1,opt.data b/testing/sisyphus/data/firefox,1.8.1,opt.data
index 4a6743fdd738..c229ce268103 100755
--- a/testing/sisyphus/data/firefox,1.8.1,opt.data
+++ b/testing/sisyphus/data/firefox,1.8.1,opt.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.1-profile
 executablepath=/work/mozilla/builds/1.8.1/mozilla/firefox-opt/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=opt
diff --git a/testing/sisyphus/data/firefox,1.8.1-test,debug.data b/testing/sisyphus/data/firefox,1.8.1-test,debug.data
index 5d4fb70b0026..45eae89d4fc3 100755
--- a/testing/sisyphus/data/firefox,1.8.1-test,debug.data
+++ b/testing/sisyphus/data/firefox,1.8.1-test,debug.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.1-test-profile
 executablepath=/work/mozilla/builds/1.8.1-test/mozilla/firefox-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/firefox,1.8.1-test,opt.data b/testing/sisyphus/data/firefox,1.8.1-test,opt.data
index b3ba50b22390..41c9bf652fc5 100755
--- a/testing/sisyphus/data/firefox,1.8.1-test,opt.data
+++ b/testing/sisyphus/data/firefox,1.8.1-test,opt.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.8.1-test-profile
 executablepath=/work/mozilla/builds/1.8.1-test/mozilla/firefox-opt/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=opt
diff --git a/testing/sisyphus/data/firefox,1.9.0,debug.data b/testing/sisyphus/data/firefox,1.9.0,debug.data
index afb6a844e5ae..322ee4af06e0 100755
--- a/testing/sisyphus/data/firefox,1.9.0,debug.data
+++ b/testing/sisyphus/data/firefox,1.9.0,debug.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/work/mozilla/builds/1.9.0/mozilla/firefox-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/firefox,1.9.0,nightly-linux.data b/testing/sisyphus/data/firefox,1.9.0,nightly-linux.data
index 174fc10057da..2aca7ae86df4 100755
--- a/testing/sisyphus/data/firefox,1.9.0,nightly-linux.data
+++ b/testing/sisyphus/data/firefox,1.9.0,nightly-linux.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.9.0
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0a5pre.en-US.linux-i686.tar.bz2
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0a7pre.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
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.9.0,nightly-mac.data b/testing/sisyphus/data/firefox,1.9.0,nightly-mac.data
index 23d2d7b89cd1..d5d3194eb151 100755
--- a/testing/sisyphus/data/firefox,1.9.0,nightly-mac.data
+++ b/testing/sisyphus/data/firefox,1.9.0,nightly-mac.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.9.0
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0a5pre.en-US.mac.dmg
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0a7pre.en-US.mac.dmg
 profilename=firefox-1.9.0-profile
 profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/tmp/firefox-1.9.0
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.9.0,nightly-win32.data b/testing/sisyphus/data/firefox,1.9.0,nightly-win32.data
index b0c6f122744b..b88657f142f8 100755
--- a/testing/sisyphus/data/firefox,1.9.0,nightly-win32.data
+++ b/testing/sisyphus/data/firefox,1.9.0,nightly-win32.data
@@ -1,10 +1,9 @@
 product=firefox
 branch=1.9.0
-url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0a5pre.en-US.win32.zip
+url=http://stage.mozilla.org/pub/mozilla.org/firefox/nightly/latest-trunk/firefox-3.0a7pre.en-US.win32.zip
 profilename=firefox-1.9.0-profile
 profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/tmp/firefox-1.9.0
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=nightly
diff --git a/testing/sisyphus/data/firefox,1.9.0,opt.data b/testing/sisyphus/data/firefox,1.9.0,opt.data
index fa5c74942131..60cadd8400d0 100755
--- a/testing/sisyphus/data/firefox,1.9.0,opt.data
+++ b/testing/sisyphus/data/firefox,1.9.0,opt.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.9.0-profile
 executablepath=/work/mozilla/builds/1.9.0/mozilla/firefox-opt/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=opt
diff --git a/testing/sisyphus/data/firefox,1.9.0-test,debug.data b/testing/sisyphus/data/firefox,1.9.0-test,debug.data
index 4cca12f69d31..292de738a9be 100755
--- a/testing/sisyphus/data/firefox,1.9.0-test,debug.data
+++ b/testing/sisyphus/data/firefox,1.9.0-test,debug.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.9.0-test-profile
 executablepath=/work/mozilla/builds/1.9.0-test/mozilla/firefox-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/firefox,1.9.0-test,opt.data b/testing/sisyphus/data/firefox,1.9.0-test,opt.data
index 49434fe62cbd..218344d94a9b 100755
--- a/testing/sisyphus/data/firefox,1.9.0-test,opt.data
+++ b/testing/sisyphus/data/firefox,1.9.0-test,opt.data
@@ -5,5 +5,4 @@ profiledirectory=/tmp/firefox-1.9.0-test-profile
 executablepath=/work/mozilla/builds/1.9.0-test/mozilla/firefox-opt/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
-
-
+buildtype=opt
diff --git a/testing/sisyphus/data/js,1.8.0,debug.data b/testing/sisyphus/data/js,1.8.0,debug.data
index 21890f06aa1f..9cfd423ad38e 100755
--- a/testing/sisyphus/data/js,1.8.0,debug.data
+++ b/testing/sisyphus/data/js,1.8.0,debug.data
@@ -2,5 +2,3 @@ product=js
 branch=1.8.0
 sourcepath=/work/mozilla/builds/1.8.0/mozilla/js/src
 buildtype=debug
-
-
diff --git a/testing/sisyphus/data/js,1.8.0,opt.data b/testing/sisyphus/data/js,1.8.0,opt.data
index 5f74d0b51c4d..ed4c8d655fa9 100755
--- a/testing/sisyphus/data/js,1.8.0,opt.data
+++ b/testing/sisyphus/data/js,1.8.0,opt.data
@@ -2,5 +2,3 @@ product=js
 branch=1.8.0
 sourcepath=/work/mozilla/builds/1.8.0/mozilla/js/src
 buildtype=opt
-
-
diff --git a/testing/sisyphus/data/js,1.8.0-test,debug.data b/testing/sisyphus/data/js,1.8.0-test,debug.data
index 4e1819dfdc5e..cd125010cdc2 100755
--- a/testing/sisyphus/data/js,1.8.0-test,debug.data
+++ b/testing/sisyphus/data/js,1.8.0-test,debug.data
@@ -2,5 +2,3 @@ product=js
 branch=1.8.0
 sourcepath=/work/mozilla/builds/1.8.0-test/mozilla/js/src
 buildtype=debug
-
-
diff --git a/testing/sisyphus/data/js,1.8.0-test,opt.data b/testing/sisyphus/data/js,1.8.0-test,opt.data
index 24be0c034b12..b0026977e0e2 100755
--- a/testing/sisyphus/data/js,1.8.0-test,opt.data
+++ b/testing/sisyphus/data/js,1.8.0-test,opt.data
@@ -2,5 +2,3 @@ product=js
 branch=1.8.0
 sourcepath=/work/mozilla/builds/1.8.0-test/mozilla/js/src
 buildtype=opt
-
-
diff --git a/testing/sisyphus/data/js,1.8.1,debug.data b/testing/sisyphus/data/js,1.8.1,debug.data
index 5f7f38cc8e68..30a4cf496e66 100755
--- a/testing/sisyphus/data/js,1.8.1,debug.data
+++ b/testing/sisyphus/data/js,1.8.1,debug.data
@@ -2,5 +2,3 @@ product=js
 branch=1.8.1
 sourcepath=/work/mozilla/builds/1.8.1/mozilla/js/src
 buildtype=debug
-
-
diff --git a/testing/sisyphus/data/js,1.8.1,opt.data b/testing/sisyphus/data/js,1.8.1,opt.data
index 1eb237a0943a..cc022e787644 100755
--- a/testing/sisyphus/data/js,1.8.1,opt.data
+++ b/testing/sisyphus/data/js,1.8.1,opt.data
@@ -2,6 +2,3 @@ product=js
 branch=1.8.1
 sourcepath=/work/mozilla/builds/1.8.1/mozilla/js/src
 buildtype=opt
-
-
-
diff --git a/testing/sisyphus/data/js,1.8.1-test,debug.data b/testing/sisyphus/data/js,1.8.1-test,debug.data
index ce1a067607c4..e2c800314999 100755
--- a/testing/sisyphus/data/js,1.8.1-test,debug.data
+++ b/testing/sisyphus/data/js,1.8.1-test,debug.data
@@ -2,5 +2,3 @@ product=js
 branch=1.8.1
 sourcepath=/work/mozilla/builds/1.8.1-test/mozilla/js/src
 buildtype=debug
-
-
diff --git a/testing/sisyphus/data/js,1.8.1-test,opt.data b/testing/sisyphus/data/js,1.8.1-test,opt.data
index 968d6fdb2080..76cf3dcc5817 100755
--- a/testing/sisyphus/data/js,1.8.1-test,opt.data
+++ b/testing/sisyphus/data/js,1.8.1-test,opt.data
@@ -2,6 +2,3 @@ product=js
 branch=1.8.1
 sourcepath=/work/mozilla/builds/1.8.1-test/mozilla/js/src
 buildtype=opt
-
-
-
diff --git a/testing/sisyphus/data/js,1.9.0,debug.data b/testing/sisyphus/data/js,1.9.0,debug.data
index ee2fb8cd1863..1616a630fd57 100755
--- a/testing/sisyphus/data/js,1.9.0,debug.data
+++ b/testing/sisyphus/data/js,1.9.0,debug.data
@@ -2,5 +2,3 @@ product=js
 branch=1.9.0
 sourcepath=/work/mozilla/builds/1.9.0/mozilla/js/src
 buildtype=debug
-
-
diff --git a/testing/sisyphus/data/js,1.9.0,opt.data b/testing/sisyphus/data/js,1.9.0,opt.data
index ebb61c9c2042..7568e5cf8103 100755
--- a/testing/sisyphus/data/js,1.9.0,opt.data
+++ b/testing/sisyphus/data/js,1.9.0,opt.data
@@ -2,5 +2,3 @@ product=js
 branch=1.9.0
 sourcepath=/work/mozilla/builds/1.9.0/mozilla/js/src
 buildtype=opt
-
-
diff --git a/testing/sisyphus/data/js,1.9.0-test,debug.data b/testing/sisyphus/data/js,1.9.0-test,debug.data
index 2a9d5a2de029..74a7ec4c1aff 100755
--- a/testing/sisyphus/data/js,1.9.0-test,debug.data
+++ b/testing/sisyphus/data/js,1.9.0-test,debug.data
@@ -2,5 +2,3 @@ product=js
 branch=1.9.0
 sourcepath=/work/mozilla/builds/1.9.0-test/mozilla/js/src
 buildtype=debug
-
-
diff --git a/testing/sisyphus/data/js,1.9.0-test,opt.data b/testing/sisyphus/data/js,1.9.0-test,opt.data
index 4c3330aa7144..60717636fd53 100755
--- a/testing/sisyphus/data/js,1.9.0-test,opt.data
+++ b/testing/sisyphus/data/js,1.9.0-test,opt.data
@@ -2,5 +2,3 @@ product=js
 branch=1.9.0
 sourcepath=/work/mozilla/builds/1.9.0-test/mozilla/js/src
 buildtype=opt
-
-
diff --git a/testing/sisyphus/data/thunderbird,1.8.0,debug.data b/testing/sisyphus/data/thunderbird,1.8.0,debug.data
index fcb8ca732d9d..ab8979dabfce 100755
--- a/testing/sisyphus/data/thunderbird,1.8.0,debug.data
+++ b/testing/sisyphus/data/thunderbird,1.8.0,debug.data
@@ -6,5 +6,4 @@ executablepath=/work/mozilla/builds/1.8.0/mozilla/thunderbird-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 profiletemplate=/work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/thunderbird,1.8.0-test,debug.data b/testing/sisyphus/data/thunderbird,1.8.0-test,debug.data
index bc90018d0308..c55ef8e6b6c0 100755
--- a/testing/sisyphus/data/thunderbird,1.8.0-test,debug.data
+++ b/testing/sisyphus/data/thunderbird,1.8.0-test,debug.data
@@ -6,5 +6,4 @@ executablepath=/work/mozilla/builds/1.8.0-test/mozilla/thunderbird-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 profiletemplate=/work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/thunderbird,1.8.1,debug.data b/testing/sisyphus/data/thunderbird,1.8.1,debug.data
index b061cb408247..c6789b6deab3 100755
--- a/testing/sisyphus/data/thunderbird,1.8.1,debug.data
+++ b/testing/sisyphus/data/thunderbird,1.8.1,debug.data
@@ -6,5 +6,4 @@ executablepath=/work/mozilla/builds/1.8.1/mozilla/thunderbird-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 profiletemplate=/work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/thunderbird,1.8.1-test,debug.data b/testing/sisyphus/data/thunderbird,1.8.1-test,debug.data
index 6a94687a87f6..60a74ef62585 100755
--- a/testing/sisyphus/data/thunderbird,1.8.1-test,debug.data
+++ b/testing/sisyphus/data/thunderbird,1.8.1-test,debug.data
@@ -6,5 +6,4 @@ executablepath=/work/mozilla/builds/1.8.1-test/mozilla/thunderbird-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 profiletemplate=/work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/thunderbird,1.9.0,debug.data b/testing/sisyphus/data/thunderbird,1.9.0,debug.data
index cd77fa3bf519..232e7ea426c7 100755
--- a/testing/sisyphus/data/thunderbird,1.9.0,debug.data
+++ b/testing/sisyphus/data/thunderbird,1.9.0,debug.data
@@ -6,5 +6,4 @@ executablepath=/work/mozilla/builds/1.9.0/mozilla/thunderbird-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 profiletemplate=/work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap
-
-
+buildtype=debug
diff --git a/testing/sisyphus/data/thunderbird,1.9.0-test,debug.data b/testing/sisyphus/data/thunderbird,1.9.0-test,debug.data
index 71facd45bd26..2908e37c7f9c 100755
--- a/testing/sisyphus/data/thunderbird,1.9.0-test,debug.data
+++ b/testing/sisyphus/data/thunderbird,1.9.0-test,debug.data
@@ -6,5 +6,7 @@ executablepath=/work/mozilla/builds/1.9.0-test/mozilla/thunderbird-debug/dist
 userpreferences=/work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js
 extensiondir=/work/mozilla/mozilla.com/test.mozilla.com/www/xpi
 profiletemplate=/work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap
+buildtype=debug
+
 
 
diff --git a/testing/sisyphus/prefs/mail-user.js b/testing/sisyphus/prefs/mail-user.js
index f68662adcc7e..5e2444e804d0 100755
--- a/testing/sisyphus/prefs/mail-user.js
+++ b/testing/sisyphus/prefs/mail-user.js
@@ -20,3 +20,4 @@ user_pref("signed.applets.codebase_principal_support", true);
 user_pref("mailnews.start_page.override_url", "http://test.mozilla.com/bin/install-extensions-1.html");
 user_pref("mailnews.start_page.url", "http://test.mozilla.com/bin/install-extensions-1.html");
 user_pref("mailnews.start_page.welcome_url", "http://test.mozilla.com/bin/install-extensions-1.html");
+user_pref("browser.warnOnQuit", false);
\ No newline at end of file
diff --git a/testing/sisyphus/prefs/public-user.js b/testing/sisyphus/prefs/public-user.js
index 3644fdfbc5b6..5cb9389ef2db 100755
--- a/testing/sisyphus/prefs/public-user.js
+++ b/testing/sisyphus/prefs/public-user.js
@@ -26,3 +26,4 @@ user_pref("security.warn_leaving_secure", false);
 user_pref("security.warn_submit_insecure", false);
 user_pref("security.warn_viewing_mixed", false);
 user_pref("signed.applets.codebase_principal_support", true);
+user_pref("browser.warnOnQuit", false);
diff --git a/testing/sisyphus/prefs/test-user.js b/testing/sisyphus/prefs/test-user.js
index c1ce31821387..b957248eddec 100755
--- a/testing/sisyphus/prefs/test-user.js
+++ b/testing/sisyphus/prefs/test-user.js
@@ -23,3 +23,4 @@ user_pref("security.warn_leaving_secure", false);
 user_pref("security.warn_submit_insecure", false);
 user_pref("security.warn_viewing_mixed", false);
 user_pref("signed.applets.codebase_principal_support", true);
+user_pref("browser.warnOnQuit", false);
diff --git a/testing/sisyphus/tests/mozilla.org/download-page/test.sh b/testing/sisyphus/tests/mozilla.org/download-page/test.sh
index bdedfd4a5841..08447aecf188 100755
--- a/testing/sisyphus/tests/mozilla.org/download-page/test.sh
+++ b/testing/sisyphus/tests/mozilla.org/download-page/test.sh
@@ -4,6 +4,8 @@ TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www}
 TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}
 source ${TEST_BIN}/library.sh
 
+TEST_DLDIR=${TEST_DLDIR:-$TEST_DIR/tests/mozilla.org/download-page}
+
 TEST_DOWNLOAD_PAGE_TIMEOUT=${TEST_DOWNLOAD_PAGE_TIMEOUT:-60}
 TEST_DOWNLOAD_BUILD_TIMEOUT=${TEST_DOWNLOAD_BUILD_TIMEOUT:-900}
 
@@ -78,21 +80,23 @@ fi
 
 executable=`get_executable $product $branch $executablepath`
 
+urlfile=`mktemp /tmp/URLS.XXXX`
+
 if [[ "$test" == "all" ]]; then
-    $TEST_BIN/timed_run.py $TEST_DOWNLOAD_PAGE_TIMEOUT "test download" \
+    $timed_run.py $TEST_DOWNLOAD_PAGE_TIMEOUT "test download" \
 	"$executable" -P "$profilename" -spider -start -quit \
 	-uri "$allurl" -timeout=$TEST_DOWNLOAD_PAGE_TIMEOUT \
 	-hook "http://$TEST_HTTP/tests/mozilla.org/download-page/collect-urls-userhook.js" | \
-	grep 'href: ' | sed 's/^href: //' > urls.txt
+	grep 'href: ' | sed 's/^href: //' > $urlfile
 elif [[ "$test" == "ftp" ]]; then
-    $TEST_BIN/timed_run.py $TEST_DOWNLOAD_PAGE_TIMEOUT "test download" \
+    $timed_run.py $TEST_DOWNLOAD_PAGE_TIMEOUT "test download" \
 	"$executable" -P "$profilename" -spider -start -quit \
 	-uri "$allurl" -timeout=$TEST_DOWNLOAD_PAGE_TIMEOUT \
 	-hook "http://$TEST_HTTP/tests/mozilla.org/download-page/userhook-ftp.js" | \
-	grep 'href: ' | sed 's/^href: //' > urls.txt
+	grep 'href: ' | sed 's/^href: //' > $urlfile
 fi
 
-cat urls.txt | while read url; do
+cat $urlfile | while read url; do
 
     echo "Processing $url"
 
@@ -123,7 +127,7 @@ cat urls.txt | while read url; do
 	    ;;
     esac
 
-    filepath=`mktemp DOWNLOAD.XXXXXX`
+    filepath=`mktemp /tmp/DOWNLOAD.XXXXXX`
     
     downloadexecutablepath="/tmp/download-$downloadproduct-$downloadbranch"
     downloadprofilepath="/tmp/download-$downloadproduct-$downloadbranch-profile"
@@ -135,14 +139,14 @@ cat urls.txt | while read url; do
 
     if ! install-build.sh  -p "$downloadproduct" -b "$downloadbranch" \
 	-x $downloadexecutablepath \
-	-f `pwd`/$filepath; then
+	-f $filepath; then
 	continue
     fi
 
     rm $filepath
 
     if [[ "$downloadproduct" == "thunderbird" ]]; then
-	template="-L /work/mozilla/mozilla.com/test.mozilla.com/www/profiles/imap"
+	template="-L $TEST_DIR/profiles/imap"
     else
 	unset template
     fi
@@ -151,7 +155,7 @@ cat urls.txt | while read url; do
 	-x $downloadexecutablepath \
 	-D $downloadprofilepath \
 	-N $downloadprofilename \
-	-U /work/mozilla/mozilla.com/test.mozilla.com/www/prefs/mail-user.js \
+	-U $TEST_DIR/prefs/mail-user.js \
 	$template; then
 	continue
     fi
@@ -159,7 +163,7 @@ cat urls.txt | while read url; do
     if ! install-extensions.sh -p "$downloadproduct" -b "$downloadbranch" \
 	-x $downloadexecutablepath \
 	-N $downloadprofilename \
-	-E /work/mozilla/mozilla.com/test.mozilla.com/www/xpi; then
+	-E $TEST_DIR/xpi; then
 	continue
     fi
 
@@ -183,5 +187,6 @@ cat urls.txt | while read url; do
 	continue
     fi
 
-
 done
+
+rm $urlfile