From 67a273c929547fb7817f46b2ed410c729d6f93e1 Mon Sep 17 00:00:00 2001 From: "bclary@bclary.com" Date: Thu, 4 Oct 2007 08:57:41 -0700 Subject: [PATCH] Sisyphus - update shell scripts to use /bin/bash, bug 397921, not part of the build --- testing/sisyphus/bin/build.sh | 2 +- testing/sisyphus/bin/builder.sh | 2 +- testing/sisyphus/bin/check-spider.sh | 2 +- testing/sisyphus/bin/checkout.sh | 2 +- testing/sisyphus/bin/clean.sh | 2 +- testing/sisyphus/bin/create-directory.sh | 4 +- testing/sisyphus/bin/create-profile.sh | 2 +- testing/sisyphus/bin/download.sh | 2 +- testing/sisyphus/bin/edit-talkback.sh | 94 ++++++------ testing/sisyphus/bin/install-build.sh | 2 +- testing/sisyphus/bin/install-extensions.sh | 2 +- testing/sisyphus/bin/install-plugins.sh | 2 +- testing/sisyphus/bin/library.sh | 138 +++++++++--------- testing/sisyphus/bin/sayvars.sh | 2 +- testing/sisyphus/bin/set-build-env.sh | 42 +++--- testing/sisyphus/bin/smoke-build.sh | 2 +- testing/sisyphus/bin/test-setup.sh | 48 +++--- testing/sisyphus/bin/tester.sh | 2 +- testing/sisyphus/bin/uninstall-build.sh | 2 +- .../tests/mozilla.org/download-page/test.sh | 2 +- 20 files changed, 176 insertions(+), 180 deletions(-) diff --git a/testing/sisyphus/bin/build.sh b/testing/sisyphus/bin/build.sh index dbef065ca9aa..4f01cd5b6412 100755 --- a/testing/sisyphus/bin/build.sh +++ b/testing/sisyphus/bin/build.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/builder.sh b/testing/sisyphus/bin/builder.sh index b944976123d8..5cd0fdf14c4e 100755 --- a/testing/sisyphus/bin/builder.sh +++ b/testing/sisyphus/bin/builder.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/check-spider.sh b/testing/sisyphus/bin/check-spider.sh index 39fca483bd44..e91885dec714 100755 --- a/testing/sisyphus/bin/check-spider.sh +++ b/testing/sisyphus/bin/check-spider.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/checkout.sh b/testing/sisyphus/bin/checkout.sh index 6b55a0ae2e97..eef836846357 100755 --- a/testing/sisyphus/bin/checkout.sh +++ b/testing/sisyphus/bin/checkout.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/clean.sh b/testing/sisyphus/bin/clean.sh index 9254f13541b9..0c56d4161cd0 100755 --- a/testing/sisyphus/bin/clean.sh +++ b/testing/sisyphus/bin/clean.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/create-directory.sh b/testing/sisyphus/bin/create-directory.sh index a53393191988..fd65c0ab4c09 100755 --- a/testing/sisyphus/bin/create-directory.sh +++ b/testing/sisyphus/bin/create-directory.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -67,7 +67,7 @@ directories... /grandparent/parent/child. This script will destroy existing directories and their contents. It can potentially wipe out your disk. Use with caution. - ******************** WARNING ******************** +******************** WARNING ******************** EOF exit 1 diff --git a/testing/sisyphus/bin/create-profile.sh b/testing/sisyphus/bin/create-profile.sh index 0d1acc810f89..9a01263931e9 100755 --- a/testing/sisyphus/bin/create-profile.sh +++ b/testing/sisyphus/bin/create-profile.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/download.sh b/testing/sisyphus/bin/download.sh index 0102f4d0692a..382ffc0171c9 100755 --- a/testing/sisyphus/bin/download.sh +++ b/testing/sisyphus/bin/download.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/edit-talkback.sh b/testing/sisyphus/bin/edit-talkback.sh index beb2a4576ff5..83d3560846e8 100755 --- a/testing/sisyphus/bin/edit-talkback.sh +++ b/testing/sisyphus/bin/edit-talkback.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -135,68 +135,68 @@ if [[ $talkback -eq 1 ]]; then case $OSID in 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" - ;; + 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) - 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" - ;; + 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) - # 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=: - ;; + # 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=: + ;; *) - error "unknown os $OSID" - ;; - esac + error "unknown os $OSID" + ;; + esac - if [[ -z "$talkbackdir" ]]; then - error "empty talkback directory" - fi + if [[ -z "$talkbackdir" ]]; then + error "empty talkback directory" + fi - mkdir -p "$talkbackdir" - - case $OSID in - win32) + mkdir -p "$talkbackdir" + + case $OSID in + win32) talkbackinidir="$talkbackdir/$vendorid/$productid/$platformid/$buildid" ;; - linux | mac ) + linux | mac ) talkbackinidir="$talkbackdir/$vendorid$productid$platformid$buildid" ;; - esac - - if [[ ! -d "$talkbackinidir" ]]; then - create-directory.sh -d "$talkbackinidir" -n - fi + esac + + if [[ ! -d "$talkbackinidir" ]]; then + create-directory.sh -d "$talkbackinidir" -n + fi - cd $talkbackinidir + cd $talkbackinidir - cp /work/mozilla/mozilla.com/test.mozilla.com/www/talkback/$OSID/Talkback.ini . + cp /work/mozilla/mozilla.com/test.mozilla.com/www/talkback/$OSID/Talkback.ini . - case "$OSID" in - win32) + case "$OSID" in + win32) sed -i.bak "s@URLEdit .*@URLEdit = \"mozqa:$talkbackid\"@" Talkback.ini ;; - linux ) + linux ) sed -i.bak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini ;; - mac ) + mac ) sed -i.bak "s@URLEditControl .*@URLEditControl = \"mozqa:$talkbackid\"@" Talkback.ini ;; - *) + *) error "unknown os=$OSID" - esac - fi + esac +fi diff --git a/testing/sisyphus/bin/install-build.sh b/testing/sisyphus/bin/install-build.sh index da1e40fdc1e3..923d11cf690e 100755 --- a/testing/sisyphus/bin/install-build.sh +++ b/testing/sisyphus/bin/install-build.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/install-extensions.sh b/testing/sisyphus/bin/install-extensions.sh index 7e5d2ae74d0a..769c0629d47a 100755 --- a/testing/sisyphus/bin/install-extensions.sh +++ b/testing/sisyphus/bin/install-extensions.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/install-plugins.sh b/testing/sisyphus/bin/install-plugins.sh index 50304c21720b..8279b600c141 100755 --- a/testing/sisyphus/bin/install-plugins.sh +++ b/testing/sisyphus/bin/install-plugins.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/library.sh b/testing/sisyphus/bin/library.sh index e39545261d2c..dc7e6e226718 100755 --- a/testing/sisyphus/bin/library.sh +++ b/testing/sisyphus/bin/library.sh @@ -60,10 +60,6 @@ if [[ -z "$LIBRARYSH" ]]; then # export variables 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%%" @@ -155,84 +151,84 @@ if [[ -z "$LIBRARYSH" ]]; then 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" + 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 + fi + } + + if [[ "$0" == "-bash" || "$0" == "bash" ]]; then + SCRIPT="library.sh" + else + SCRIPT=`basename $0` 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 + + 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 + if ! echo ${PATH} | grep -q $TEST_BIN; then + PATH=${TEST_BIN}:$PATH fi -fi -} -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 + EXE_EXT= + else + error "Unknown OS $OSTYPE" + 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} + # save starting directory + STARTDIR=`pwd` -TEST_TIMEZONE=`date +%z` + # location of the script. + SCRIPTDIR=`dirname $0` -TEST_MACHINE=`uname -n` -TEST_KERNEL=`uname -r` -TEST_PROCESSORTYPE=`uname -p` + # don't attach to running instance + MOZ_NO_REMOTE=1 -# set path to make life easier -if ! echo ${PATH} | grep -q $TEST_BIN; then - PATH=${TEST_BIN}:$PATH -fi + # don't restart + NO_EM_RESTART=1 -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 + # bypass profile manager + MOZ_BYPASS_PROFILE_AT_STARTUP=1 -# save starting directory -STARTDIR=`pwd` + # ah crap handler timeout + MOZ_GDB_SLEEP=10 -# location of the script. -SCRIPTDIR=`dirname $0` + # no dialogs on asserts + XPCOM_DEBUG_BREAK=${XPCOM_DEBUG_BREAK:-warn} -# don't attach to running instance -MOZ_NO_REMOTE=1 + # no airbag + unset MOZ_AIRBAG + MOZ_CRASHREPORTER_DISABLE=1 + MOZ_CRASHREPORTER_NO_REPORT=1 -# don't restart -NO_EM_RESTART=1 - -# bypass profile manager -MOZ_BYPASS_PROFILE_AT_STARTUP=1 - -# ah crap handler timeout -MOZ_GDB_SLEEP=10 - -# no dialogs on asserts -XPCOM_DEBUG_BREAK=${XPCOM_DEBUG_BREAK:-warn} - -# no airbag -unset MOZ_AIRBAG -MOZ_CRASHREPORTER_DISABLE=1 -MOZ_CRASHREPORTER_NO_REPORT=1 - -#leak gauge -#NSPR_LOG_MODULES=DOMLeak:5,DocumentLeak:5,nsDocShellLeak:5 + #leak gauge + #NSPR_LOG_MODULES=DOMLeak:5,DocumentLeak:5,nsDocShellLeak:5 fi diff --git a/testing/sisyphus/bin/sayvars.sh b/testing/sisyphus/bin/sayvars.sh index ccfc363e860b..bf05e91ae889 100755 --- a/testing/sisyphus/bin/sayvars.sh +++ b/testing/sisyphus/bin/sayvars.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- for var in `echo ${!TEST_*}`; do diff --git a/testing/sisyphus/bin/set-build-env.sh b/testing/sisyphus/bin/set-build-env.sh index 971072c52aa1..c366a1496655 100755 --- a/testing/sisyphus/bin/set-build-env.sh +++ b/testing/sisyphus/bin/set-build-env.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash +#!/bin/bash # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -38,9 +38,9 @@ # ***** END LICENSE BLOCK ***** export BUILDDIR=/work/mozilla/builds -export SHELL=/usr/local/bin/bash -export CONFIG_SHELL=/usr/local/bin/bash -export CONFIGURE_ENV_ARGS=/usr/local/bin/bash +export SHELL=/bin/bash +export CONFIG_SHELL=/bin/bash +export CONFIGURE_ENV_ARGS=/bin/bash export MOZ_CVS_FLAGS="-z3 -q" export CVSROOT=:pserver:anonymous@cvs-mirror.mozilla.org:/cvsroot export MOZILLA_OFFICIAL=1 @@ -160,25 +160,25 @@ for step in step1; do # dummy loop for handling exits case "$extra" in too-much-gc) - export XCFLAGS="-DWAY_TOO_MUCH_GC=1" - export CFLAGS="-DWAY_TOO_MUCH_GC=1" - export CXXFLAGS="-DWAY_TOO_MUCH_GC=1" - ;; + export XCFLAGS="-DWAY_TOO_MUCH_GC=1" + export CFLAGS="-DWAY_TOO_MUCH_GC=1" + export CXXFLAGS="-DWAY_TOO_MUCH_GC=1" + ;; gcov) - if [[ "$OSID" == "win32" ]]; then - echo "win32 does not support gcov" + if [[ "$OSID" == "win32" ]]; then + echo "win32 does not support gcov" myexit 1 - fi - export CFLAGS="--coverage" - export CXXFLAGS="--coverage" - export XCFLAGS="--coverage" - export OS_CFLAGS="--coverage" - export LDFLAGS="--coverage" - export XLDOPTS="--coverage" - ;; + fi + export CFLAGS="--coverage" + export CXXFLAGS="--coverage" + export XCFLAGS="--coverage" + export OS_CFLAGS="--coverage" + export LDFLAGS="--coverage" + export XLDOPTS="--coverage" + ;; jprof) - ;; + ;; esac fi @@ -210,8 +210,8 @@ for step in step1; do # dummy loop for handling exits case "$OSID" in mac) - export JS_EDITLINE=1 # required for mac - ;; + export JS_EDITLINE=1 # required for mac + ;; esac # end js shell builds diff --git a/testing/sisyphus/bin/smoke-build.sh b/testing/sisyphus/bin/smoke-build.sh index 817b8e77a69c..eb5b8a83f47c 100755 --- a/testing/sisyphus/bin/smoke-build.sh +++ b/testing/sisyphus/bin/smoke-build.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 # diff --git a/testing/sisyphus/bin/test-setup.sh b/testing/sisyphus/bin/test-setup.sh index 6cdc07b09beb..3ae96c689494 100755 --- a/testing/sisyphus/bin/test-setup.sh +++ b/testing/sisyphus/bin/test-setup.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 @@ -73,30 +73,30 @@ variable description -x executablepath optional. directory tree containing executable with same name as product. If the build is downloaded and executable path is not specified, it will be defaulted to - /tmp/\$product-\$branch. - For cvs builds it will be defaulted to the appropriate - directory in - /work/mozilla/builds/\$branch/mozilla/\$product-\$buildtype/ - -N profilename optional. profilename. profilename is required if - profiledirectory or extensiondir are specified. - -D profiledirectory optional. If profiledirectory is specified, a new profile - will be created in the directory. - -L profiletemplate optional. If a new profile is created, profiletemplate is - the path to an existing profile which will be copied over - the new profile. - -U userpreferences optional. If a new profile is created, userpreferences is - the path to a user.js file to be copied into the new - profile. - If userpreferences is not specified when a new profile is - created, it is defaulted to - /work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js - -E extensiondir optional. path to directory tree containing extensions to - be installed. - -d datafiles optional. one or more filenames of files containing - environment variable definitions to be included. + /tmp/\$product-\$branch. + For cvs builds it will be defaulted to the appropriate + directory in + /work/mozilla/builds/\$branch/mozilla/\$product-\$buildtype/ +-N profilename optional. profilename. profilename is required if + profiledirectory or extensiondir are specified. +-D profiledirectory optional. If profiledirectory is specified, a new profile + will be created in the directory. +-L profiletemplate optional. If a new profile is created, profiletemplate is + the path to an existing profile which will be copied over + the new profile. +-U userpreferences optional. If a new profile is created, userpreferences is + the path to a user.js file to be copied into the new + profile. + If userpreferences is not specified when a new profile is + created, it is defaulted to + /work/mozilla/mozilla.com/test.mozilla.com/www/prefs/test-user.js +-E extensiondir optional. path to directory tree containing extensions to + be installed. +-d datafiles optional. one or more filenames of files containing + environment variable definitions to be included. - note that the environment variables should have the same - names as in the "variable" column. +note that the environment variables should have the same +names as in the "variable" column. EOF exit 1 diff --git a/testing/sisyphus/bin/tester.sh b/testing/sisyphus/bin/tester.sh index 6e819f6ae3ec..dfda155f1367 100755 --- a/testing/sisyphus/bin/tester.sh +++ b/testing/sisyphus/bin/tester.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash +#!/bin/bash # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/bin/uninstall-build.sh b/testing/sisyphus/bin/uninstall-build.sh index 927ffab8a8c1..ac121beebf8e 100755 --- a/testing/sisyphus/bin/uninstall-build.sh +++ b/testing/sisyphus/bin/uninstall-build.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e # -*- Mode: Shell-script; tab-width: 4; indent-tabs-mode: nil; -*- # ***** BEGIN LICENSE BLOCK ***** # Version: MPL 1.1/GPL 2.0/LGPL 2.1 diff --git a/testing/sisyphus/tests/mozilla.org/download-page/test.sh b/testing/sisyphus/tests/mozilla.org/download-page/test.sh index ff0580d74c74..ec72018f0ce2 100755 --- a/testing/sisyphus/tests/mozilla.org/download-page/test.sh +++ b/testing/sisyphus/tests/mozilla.org/download-page/test.sh @@ -1,4 +1,4 @@ -#!/usr/local/bin/bash -e +#!/bin/bash -e TEST_DIR=${TEST_DIR:-/work/mozilla/mozilla.com/test.mozilla.com/www} TEST_BIN=${TEST_BIN:-$TEST_DIR/bin}