Sisyphus - documentation, bug 397908

2008-07-10 20:34:04 +00:00 · 2008-07-10 20:34:04 +00:00 · 57fef9b95b
--- a/js/tests/get-universe.sh
+++ b/js/tests/get-universe.sh
@ -45,4 +45,4 @@
 # pattern-extracter.pl to encode the known failure files into regular
 # expressions.

-sed 's|.*\(TEST_BRANCH.*\), \(TEST_OS.*\), TEST_RESULT.*|\2, \1|' $@ | sort -u
+cat $@ | tr -dc '[\040-\177\n]' | sed 's|^TEST_ID=[^,]*, \(TEST_BRANCH=[^,]*, TEST_BUILDTYPE=[^,]*, TEST_TYPE=[^,]*\), \(TEST_OS=[^,]*, TEST_KERNEL=[^,]*, TEST_PROCESSORTYPE=[^,]*, TEST_MEMORY=[^,]*, TEST_CPUSPEED=[^,]*, TEST_TIMEZONE=[^,]*\),.*|\2, \1|' | sort -u
--- a/js/tests/pattern-expander.pl
+++ b/js/tests/pattern-expander.pl
@ -43,7 +43,7 @@
 # ".*" are replaced with the set of possible values specified in the
 # universe.data file.

-use lib "/work/mozilla/mozilla.com/test.mozilla.com/www/tests/mozilla.org/js";
+use lib $ENV{TEST_DIR} . "/tests/mozilla.org/js";

 use Patterns;

--- a/js/tests/pattern-extracter.pl
+++ b/js/tests/pattern-extracter.pl
@ -43,7 +43,7 @@
 # where repetitions of values found in the universe.data file are
 # replaced with wildcards ".*".

-use lib "/work/mozilla/mozilla.com/test.mozilla.com/www/tests/mozilla.org/js";
+use lib $ENV{TEST_DIR} . "/tests/mozilla.org/js";

 use Patterns;

--- a/js/tests/remove-fixed-failures.sh
+++ b/js/tests/remove-fixed-failures.sh
@ -66,7 +66,7 @@ cp $failures $failures.orig
 workfailures=`mktemp working-failures.XXXXX`
 workfixes=`mktemp working-fixes.XXXXX`

-trap "rm -f $workfailures; rm -f $temp" EXIT
+trap "rm -f ${workfailures} ${workfailures}.temp ${workfixes};" EXIT

 # create working copy of the failures file
 cp $failures $workfailures
--- a/js/tests/test.sh
+++ b/js/tests/test.sh
@ -82,7 +82,7 @@ variable            description
 ===============     ============================================================
 -p product          required. firefox|thunderbird|js
 -b branch           required. 1.8.0|1.8.1|1.9.0|1.9.1
-s sourcepath       required for shell. path to js shell source directory mozilla/js/src
+-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'
 -N profilename      required for browser. profile name 
@ -129,7 +129,7 @@ do
        T) 
            buildtype=$OPTARG;;
        s) 
-            sourcepath=$OPTARG;;
+            jsshellsourcepath=$OPTARG;;
        N) 
            profilename=$OPTARG;;
        x) 
@ -163,18 +163,18 @@ if [[ -n "$gczeal" && "$buildtype" != "debug" ]]; then
    error "gczeal is supported for buildtype debug and not $buildtype"
 fi

-dumpvars product branch buildtype sourcepath profilename executablepath excludetests includetests crashes timeouts filesonly gczeal datafiles | sed "s|^|arguments: |"
+dumpvars product branch buildtype jsshellsourcepath profilename executablepath excludetests includetests crashes timeouts filesonly gczeal datafiles | sed "s|^|arguments: |"

 pushd $TEST_JSDIR

 case $product in
    js)
-        if [[ -z "$branch" || -z "$buildtype"  || -z "$sourcepath" ]]; then
+        if [[ -z "$branch" || -z "$buildtype"  || -z "$jsshellsourcepath" ]]; then
            usage
        fi
        source config.sh
        testtype=shell
-        executable="$sourcepath/$JS_OBJDIR/js$EXE_EXT"
+        executable="$jsshellsourcepath/$JS_OBJDIR/js$EXE_EXT"
        ;;

    firefox|thunderbird)
--- a/testing/sisyphus/bin/build.sh
+++ b/testing/sisyphus/bin/build.sh
@ -42,18 +42,18 @@ source $TEST_DIR/bin/set-build-env.sh $@

 case $product in
    firefox|thunderbird)
-        cd $TREE/mozilla
+        cd $BUILDTREE/mozilla

-        if ! $buildbash $bashlogin -c "cd $TREE/mozilla; make -f client.mk build" 2>&1; then
+        if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk build" 2>&1; then

            if [[ -z "$TEST_FORCE_CLOBBER_ON_ERROR" ]]; then
                error "error during build" $LINENO
            else
                echo "error occured during build. attempting a clobber build" $LINENO
-                if ! $buildbash $bashlogin -c "cd $TREE/mozilla; make -f client.mk distclean" 2>&1; then
+                if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk distclean" 2>&1; then
                    error "error during forced clobber" $LINENO
                fi
-                if ! $buildbash $bashlogin -c "cd $TREE/mozilla; make -f client.mk build" 2>&1; then
+                if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk build" 2>&1; then
                    error "error during forced build" $LINENO
                fi
            fi
@ -104,7 +104,7 @@ case $product in
        fi
        ;;
    js)
-#    cd $TREE/mozilla/js/src
+#    cd $BUILDTREE/mozilla/js/src

    if [[ $buildtype == "debug" ]]; then
        export JSBUILDOPT=
@ -112,11 +112,11 @@ case $product in
        export JSBUILDOPT=BUILD_OPT=1
    fi

-    if ! $buildbash $bashlogin -c "cd $TREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT} clean" 2>&1; then
+    if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT} clean" 2>&1; then
        error "during js/src clean" $LINENO
    fi 

-    if ! $buildbash $bashlogin -c "cd $TREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT}" 2>&1; then
+    if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref ${JSBUILDOPT}" 2>&1; then
        error "during js/src build" $LINENO
    fi
    ;;
--- a/testing/sisyphus/bin/builder.sh
+++ b/testing/sisyphus/bin/builder.sh
@ -49,7 +49,7 @@ function usage()
 {
    cat<<EOF
 usage: 
-$SCRIPT -p products -b branches -B buildcommands -T buildtypes [-e extra] [-v]
+$SCRIPT -p products -b branches -B buildcommands -T buildtypes [-e extra] [-d datafiles] [-v]

 variable            description
 ===============     ===========================================================
--- a/testing/sisyphus/bin/checkout.sh
+++ b/testing/sisyphus/bin/checkout.sh
@ -40,7 +40,7 @@
 source $TEST_DIR/bin/library.sh
 source $TEST_DIR/bin/set-build-env.sh $@

-if [[ -z "$TREE" ]]; then
+if [[ -z "$BUILDTREE" ]]; then
    error "source tree not specified!" $LINENO
 fi

@ -53,7 +53,7 @@ if [[ "$branch" == "1.9.1" ]]; then
    # maintain a local copy of the hg repository
    # clone specific trees from it.

-    TEST_MOZILLA_HG_LOCAL=$BUILDDIR/hg.mozilla.org/`basename $TEST_MOZILLA_HG`
+    TEST_MOZILLA_HG_LOCAL=${TEST_MOZILLA_HG_LOCAL:-$BUILDDIR/hg.mozilla.org/`basename $TEST_MOZILLA_HG`}

    if [[ ! -d $BUILDDIR/hg.mozilla.org ]]; then
        mkdir $BUILDDIR/hg.mozilla.org
@ -69,7 +69,7 @@ if [[ "$branch" == "1.9.1" ]]; then
    hg pull
 fi

-cd $TREE
+cd $BUILDTREE

 case $product in
    firefox)
@ -83,7 +83,7 @@ case $product in
                        error "during checkout of $project mozconfig" $LINENO
                    fi
                fi
-                if ! $buildbash $bashlogin -c "cd $TREE/mozilla; make -f client.mk checkout" 2>&1; then
+                if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk checkout" 2>&1; then
                    error "during checkout of $project tree" $LINENO
                fi
                ;;
@ -91,13 +91,13 @@ case $product in
            1.9.1)

                if [[ ! -e mozilla/client.py ]]; then
-                    if ! hg clone $TEST_MOZILLA_HG_LOCAL $TREE/mozilla; then
+                    if ! hg clone $TEST_MOZILLA_HG_LOCAL $BUILDTREE/mozilla; then
                        error "during hg clone of $TEST_MOZILLA_HG_LOCAL" $LINENO
                    fi
                fi

                cd mozilla
-                hg pull -r $TEST_MOZILLA_HG_REV
+                hg pull -u -r $TEST_MOZILLA_HG_REV
                
                # do not use mozilla-build on windows systems as we 
                # must use the cygwin python with the cygwin mercurial.
@ -135,20 +135,20 @@ case $product in
                    fi
                fi

-                if ! $buildbash $bashlogin -c "cd $TREE/mozilla; make -f client.mk checkout" 2>&1; then
+                if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk checkout" 2>&1; then
                    error "during checkout of $project tree" $LINENO
                fi
                ;;

            1.9.1)
                if [[ ! -e mozilla/client.py ]]; then
-                    if ! hg clone $TEST_MOZILLA_HG_LOCAL $TREE/mozilla; then
+                    if ! hg clone $TEST_MOZILLA_HG_LOCAL $BUILDTREE/mozilla; then
                        error "during hg clone of $TEST_MOZILLA_HG_LOCAL" $LINENO
                    fi
                fi

                cd mozilla
-                hg pull -r $TEST_MOZILLA_HG_REV
+                hg pull -u -r $TEST_MOZILLA_HG_REV

                # do not use mozilla-build on windows systems as we 
                # must use the cygwin python with the cygwin mercurial.
@ -190,13 +190,13 @@ case $product in
            1.9.1)

                if [[ ! -e mozilla/client.py ]]; then
-                    if ! hg clone $TEST_MOZILLA_HG_LOCAL $TREE/mozilla; then
+                    if ! hg clone $TEST_MOZILLA_HG_LOCAL $BUILDTREE/mozilla; then
                        error "during hg clone of $TEST_MOZILLA_HG_LOCAL" $LINENO
                    fi
                fi

                cd mozilla
-                hg pull -r $TEST_MOZILLA_HG_REV
+                hg pull -u -r $TEST_MOZILLA_HG_REV

                # do not use mozilla-build on windows systems as we 
                # must use the cygwin python with the cygwin mercurial.
--- a/testing/sisyphus/bin/clean.sh
+++ b/testing/sisyphus/bin/clean.sh
@ -42,21 +42,21 @@ source $TEST_DIR/bin/set-build-env.sh $@

 case $product in
    firefox|thunderbird)
-#        cd $TREE/mozilla
+#        cd $BUILDTREE/mozilla

-        if ! $buildbash $bashlogin -c "cd $TREE/mozilla; make -f client.mk clean" 2>&1; then
+        if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla; make -f client.mk clean" 2>&1; then
            error "during client.mk clean" $LINENO
        fi
        ;;

    js)
-#        cd $TREE/mozilla/js/src/editline
-        if ! $buildbash $bashlogin -c "cd $TREE/mozilla/js/src/editline; make -f Makefile.ref clean" 2>&1; then
+#        cd $BUILDTREE/mozilla/js/src/editline
+        if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src/editline; make -f Makefile.ref clean" 2>&1; then
            error "during editline clean" $LINENO
        fi

 #        cd ..
-        if ! $buildbash $bashlogin -c "cd $TREE/mozilla/js/src; make -f Makefile.ref clean" 2>&1; then
+        if ! $buildbash $bashlogin -c "cd $BUILDTREE/mozilla/js/src; make -f Makefile.ref clean" 2>&1; then
            error "during SpiderMonkey clean" $LINENO
        fi
        ;;
--- a/testing/sisyphus/bin/combo.sh
+++ b/testing/sisyphus/bin/combo.sh
@ -30,17 +30,17 @@ output combinations of items in each list using delim as the delimiter

 -d delim specifies the delimiter. The default is comma (,).

-$combo.sh "a b" 
+combo.sh "a b" 
 a
 b

-combo.ah "a b" "1 2" 
+combo.sh "a b" "1 2" 
 a,1 
 a,2 
 b,1 
 b,2

-combo.ah -d "-" "a b" "1 2" 
+combo.sh -d "-" "a b" "1 2" 
 a-1 
 a-2 
 b-1 
--- a/testing/sisyphus/bin/download.sh
+++ b/testing/sisyphus/bin/download.sh
@ -37,6 +37,8 @@
 #
 # ***** END LICENSE BLOCK *****

+source $TEST_DIR/bin/library.sh
+
 args=$@
 script=`basename $0`

--- a/testing/sisyphus/bin/library.sh
+++ b/testing/sisyphus/bin/library.sh
@ -262,7 +262,7 @@ if [[ -z "$LIBRARYSH" ]]; then

    LIBRARYSH=1

-    MALLOC_CHECK_=2
+    MALLOC_CHECK_=${MALLOC_CHECK_:-2}

    ulimit -c 0

--- a/testing/sisyphus/bin/set-build-env.sh
+++ b/testing/sisyphus/bin/set-build-env.sh
@ -228,9 +228,9 @@ for step in step1; do # dummy loop for handling exits
    export TEST_MOZILLA_HG_REV=${TEST_MOZILLA_HG_REV:-tip}

    if [[ -z $extra ]]; then
-        export TREE="$BUILDDIR/$branch"
+        export BUILDTREE="$BUILDDIR/$branch"
    else
-        export TREE="$BUILDDIR/$branch$extra"
+        export BUILDTREE="$BUILDDIR/$branch$extra"

        #
        # extras can't be placed in mozconfigs since not all parts
@ -263,8 +263,8 @@ for step in step1; do # dummy loop for handling exits
        esac
    fi

-    if [[ ! -d $TREE ]]; then
-        echo "Build directory $TREE does not exist"
+    if [[ ! -d $BUILDTREE ]]; then
+        echo "Build directory $BUILDTREE does not exist"
        myexit 2
    fi

@ -272,14 +272,14 @@ for step in step1; do # dummy loop for handling exits
    # and is used to find mozilla/(browser|mail)/config/mozconfig
    if [[ $product == "firefox" ]]; then
        project=browser
-        export MOZCONFIG="$TREE/mozconfig-firefox-$OSID-$TEST_PROCESSORTYPE-$buildtype"
+        export MOZCONFIG=${MOZCONFIG:-"$BUILDTREE/mozconfig-firefox-$OSID-$TEST_PROCESSORTYPE-$buildtype"}
    elif [[ $product == "thunderbird" ]]; then
        project=mail
-        export MOZCONFIG="$TREE/mozconfig-thunderbird-$OSID-$TEST_PROCESSORTYPE-$buildtype"
+        export MOZCONFIG=${MOZCONFIG:-"$BUILDTREE/mozconfig-thunderbird-$OSID-$TEST_PROCESSORTYPE-$buildtype"}
    else
        echo "Assuming project=browser for product: $product"
        project=browser
-        export MOZCONFIG="$TREE/mozconfig-firefox-$OSID-$TEST_PROCESSORTYPE-$buildtype"
+        export MOZCONFIG=${MOZCONFIG:-"$BUILDTREE/mozconfig-firefox-$OSID-$TEST_PROCESSORTYPE-$buildtype"}
    fi

    # js shell builds
--- a/testing/sisyphus/data/js,1.8.0,debug.data
+++ b/testing/sisyphus/data/js,1.8.0,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.0
-sourcepath=${BUILDDIR}/1.8.0/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.0/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.8.0,opt.data
+++ b/testing/sisyphus/data/js,1.8.0,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.0
-sourcepath=${BUILDDIR}/1.8.0/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.0/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.8.0-test,debug.data
+++ b/testing/sisyphus/data/js,1.8.0-test,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.0
-sourcepath=${BUILDDIR}/1.8.0-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.0-test/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.8.0-test,opt.data
+++ b/testing/sisyphus/data/js,1.8.0-test,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.0
-sourcepath=${BUILDDIR}/1.8.0-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.0-test/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.8.1,debug.data
+++ b/testing/sisyphus/data/js,1.8.1,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.1
-sourcepath=${BUILDDIR}/1.8.1/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.1/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.8.1,opt.data
+++ b/testing/sisyphus/data/js,1.8.1,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.1
-sourcepath=${BUILDDIR}/1.8.1/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.1/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.8.1,too-much-gc,debug.data
+++ b/testing/sisyphus/data/js,1.8.1,too-much-gc,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.1
-sourcepath=${BUILDDIR}/1.8.1-too-much-gc/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.1-too-much-gc/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.8.1-test,debug.data
+++ b/testing/sisyphus/data/js,1.8.1-test,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.1
-sourcepath=${BUILDDIR}/1.8.1-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.1-test/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.8.1-test,opt.data
+++ b/testing/sisyphus/data/js,1.8.1-test,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.8.1
-sourcepath=${BUILDDIR}/1.8.1-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.8.1-test/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.9.0,debug.data
+++ b/testing/sisyphus/data/js,1.9.0,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.9.0,opt.data
+++ b/testing/sisyphus/data/js,1.9.0,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.9.0,too-much-gc,debug.data
+++ b/testing/sisyphus/data/js,1.9.0,too-much-gc,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0-too-much-gc/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0-too-much-gc/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.9.0-gcov,debug.data
+++ b/testing/sisyphus/data/js,1.9.0-gcov,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0-gcov/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0-gcov/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.9.0-gcov,opt.data
+++ b/testing/sisyphus/data/js,1.9.0-gcov,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0-gcov/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0-gcov/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.9.0-test,debug.data
+++ b/testing/sisyphus/data/js,1.9.0-test,debug.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0-test/mozilla/js/src
 buildtype=debug
--- a/testing/sisyphus/data/js,1.9.0-test,opt.data
+++ b/testing/sisyphus/data/js,1.9.0-test,opt.data
@ -1,4 +1,4 @@
 product=js
 branch=1.9.0
-sourcepath=${BUILDDIR}/1.9.0-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.0-test/mozilla/js/src
 buildtype=opt
--- a/testing/sisyphus/data/js,1.9.1,debug.data
+++ b/testing/sisyphus/data/js,1.9.1,debug.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
 buildtype=debug
 TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central
--- a/testing/sisyphus/data/js,1.9.1,opt.data
+++ b/testing/sisyphus/data/js,1.9.1,opt.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
 buildtype=opt
 TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central
--- a/testing/sisyphus/data/js,1.9.1,too-much-gc,debug.data
+++ b/testing/sisyphus/data/js,1.9.1,too-much-gc,debug.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1-too-much-gc/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1-too-much-gc/mozilla/js/src
 buildtype=debug
 TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central
--- a/testing/sisyphus/data/js,1.9.1-actionmonkey,debug.data
+++ b/testing/sisyphus/data/js,1.9.1-actionmonkey,debug.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
 buildtype=debug
 TEST_MOZILLA_HG=http://hg.mozilla.org/actionmonkey
--- a/testing/sisyphus/data/js,1.9.1-actionmonkey,opt.data
+++ b/testing/sisyphus/data/js,1.9.1-actionmonkey,opt.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1/mozilla/js/src
 buildtype=opt
 TEST_MOZILLA_HG=http://hg.mozilla.org/actionmonkey
--- a/testing/sisyphus/data/js,1.9.1-test,debug.data
+++ b/testing/sisyphus/data/js,1.9.1-test,debug.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1-test/mozilla/js/src
 buildtype=debug
 TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central
--- a/testing/sisyphus/data/js,1.9.1-test,opt.data
+++ b/testing/sisyphus/data/js,1.9.1-test,opt.data
@ -1,5 +1,5 @@
 product=js
 branch=1.9.1
-sourcepath=${BUILDDIR}/1.9.1-test/mozilla/js/src
+jsshellsourcepath=${BUILDDIR}/1.9.1-test/mozilla/js/src
 buildtype=opt
 TEST_MOZILLA_HG=http://hg.mozilla.org/mozilla-central
--- a/testing/sisyphus/talkback/darwin/Talkback.ini
+++ b/testing/sisyphus/talkback/darwin/Talkback.ini
@ -0,0 +1,8 @@
+HistorySettings = 3, 10, 100
+EnableAgentFromWizard = 1
+SeenIntro = 1
+UserEmailAddress = "mozqa@mozilla.com"
+URLEditControl = 
+PromptUser = 0
+LocalKey = BFAF47F801
+RandomPool = A21DF17FEA8D8A9F5155C3D45CA2AC367763CB23915C6F6BF6F810F264DFCE67EF4067E0CEA849A3A9C25D74D26CA10B08A9D03D1BB34D51A5DD4186721B3C4A38B35F4B3F1869F0235EFB88A3DC59AABD86129BCA6C7BAD7B8A0DBED0AF57BE284C750E48F94745879C3F5F932BCA2494E4D9430D9942264E02F7C29C8C4375
--- a/testing/sisyphus/talkback/nt/Talkback.ini
+++ b/testing/sisyphus/talkback/nt/Talkback.ini
@ -0,0 +1,8 @@
+HistorySettings = 3, 10, 100
+EnableAgentFromWizard = 1
+SeenIntro = 1
+EmailEdit = "mozqa@mozilla.com"
+URLEdit = 
+PromptUser = 0
+LocalKey = BFAF47F801
+RandomPool = A21DF17FEA8D8A9F5155C3D45CA2AC367763CB23915C6F6BF6F810F264DFCE67EF4067E0CEA849A3A9C25D74D26CA10B08A9D03D1BB34D51A5DD4186721B3C4A38B35F4B3F1869F0235EFB88A3DC59AABD86129BCA6C7BAD7B8A0DBED0AF57BE284C750E48F94745879C3F5F932BCA2494E4D9430D9942264E02F7C29C8C4375
--- a/testing/sisyphus/tests/mozilla.org/download-page/collect-urls-userhook.js
+++ b/testing/sisyphus/tests/mozilla.org/download-page/collect-urls-userhook.js
@ -43,7 +43,8 @@ function collectLinks()
  case 'MacIntel':
    os = 'osx';
    break;
-  case 'Linux*':
+  case 'Linux i686':
+  case 'Linux i686 (x86_64)':
    os = 'linux';
    break;
  default:
--- a/testing/sisyphus/tests/mozilla.org/download-page/userhook.js
+++ b/testing/sisyphus/tests/mozilla.org/download-page/userhook.js
@ -1,6 +1,5 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */

-
 function userOnStart()
 {
  dlog('userOnStart()');