Sisyphus - support buildbot, js test automation, work in progress. Bug 386992, not part of the build

This commit is contained in:
bclary@bclary.com 2007-07-05 09:36:55 -07:00
Родитель 25671496a4
Коммит 42ca1d03de
75 изменённых файлов: 396 добавлений и 388 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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
sed -f master.sed -i.bak 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
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@'`
fi
case $OSID in
"win32")
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"

Просмотреть файл

@ -116,8 +116,8 @@ 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
@ -125,8 +125,9 @@ else
else
error "unknown file type $filetype"
fi
;;
elif [[ $OSID == "mac" ]]; then
mac*)
# answer license prompt
result=`${TEST_BIN}/hdiutil-expect.ex $filename`
# now get the volume data
@ -145,8 +146,8 @@ else
done
hdiutil detach $disk
fi
;;
esac
#
# patch unix-like startup scripts to exec instead of

Просмотреть файл

@ -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,29 +44,99 @@
# 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()
{
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()
{
get_executable_product="$1"
get_executable_branch="$2"
get_executable_directory="$3"
@ -82,86 +152,85 @@ get_executable()
# 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
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
else
;;
*)
get_executable_filter="$get_executable_product"
fi
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
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

Просмотреть файл

@ -138,22 +138,8 @@ for step in step1; do # dummy loop for handling exits
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"
else
OSID=linux
# export APPBIN=bin
export platform=i686
fi
@ -214,9 +200,11 @@ for step in step1; do # dummy loop for handling exits
export BUILD_OPT=1
fi
if [[ $OSID == "mac" ]]; then
case "$OSID" in
mac)
export JS_EDITLINE=1 # required for mac
fi
;;
esac
# end js shell builds
set | sed 's/^/environment: /'

Просмотреть файл

@ -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,7 +203,8 @@ if [[ -n "$buildcommands" ]]; then
usage
fi
if [[ "$OSID" == "mac" ]]; then
case "$OSID" in
mac*)
if [[ "$product" == "firefox" ]]; then
App=Firefox
elif [[ "$product" == "thunderbird" ]]; then
@ -200,9 +214,10 @@ if [[ -n "$buildcommands" ]]; 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
esac
if echo "$buildcommands" | grep -iq clean; then
clean.sh -p $product -b $branch -t $buildtype

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.8.0
sourcepath=/work/mozilla/builds/1.8.0/mozilla/js/src
buildtype=debug

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.8.0
sourcepath=/work/mozilla/builds/1.8.0/mozilla/js/src
buildtype=opt

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.8.0
sourcepath=/work/mozilla/builds/1.8.0-test/mozilla/js/src
buildtype=debug

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.8.0
sourcepath=/work/mozilla/builds/1.8.0-test/mozilla/js/src
buildtype=opt

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.8.1
sourcepath=/work/mozilla/builds/1.8.1/mozilla/js/src
buildtype=debug

Просмотреть файл

@ -2,6 +2,3 @@ product=js
branch=1.8.1
sourcepath=/work/mozilla/builds/1.8.1/mozilla/js/src
buildtype=opt

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.8.1
sourcepath=/work/mozilla/builds/1.8.1-test/mozilla/js/src
buildtype=debug

Просмотреть файл

@ -2,6 +2,3 @@ product=js
branch=1.8.1
sourcepath=/work/mozilla/builds/1.8.1-test/mozilla/js/src
buildtype=opt

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.9.0
sourcepath=/work/mozilla/builds/1.9.0/mozilla/js/src
buildtype=debug

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.9.0
sourcepath=/work/mozilla/builds/1.9.0/mozilla/js/src
buildtype=opt

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.9.0
sourcepath=/work/mozilla/builds/1.9.0-test/mozilla/js/src
buildtype=debug

Просмотреть файл

@ -2,5 +2,3 @@ product=js
branch=1.9.0
sourcepath=/work/mozilla/builds/1.9.0-test/mozilla/js/src
buildtype=opt

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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

Просмотреть файл

@ -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);

Просмотреть файл

@ -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);

Просмотреть файл

@ -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);

Просмотреть файл

@ -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