зеркало из https://github.com/mozilla/gecko-dev.git
Sisyphus/JavaScript Tests - lower timeout to 2 minutes, bug 417932, not part of the build
This commit is contained in:
Родитель
6e2677d193
Коммит
251400db20
|
@ -274,9 +274,13 @@ while ($file = shift @ARGV)
|
|||
|
||||
# may be in 'completed test' for delayed browser only tests.
|
||||
die "FATAL ERROR: jstest not in test: test state: $test_state: $_, log: $file"
|
||||
if ('running test, reporting test, completed test' !~ /$test_state/);
|
||||
if ('running test, reporting test, completed test, finished test' !~ /$test_state/);
|
||||
|
||||
$test_state = 'reporting test';
|
||||
if ($test_state ne 'finished test')
|
||||
{
|
||||
# once the test is finished, don't change state here.
|
||||
$test_state = 'reporting test';
|
||||
}
|
||||
($tmp_test_id) = $_ =~ /^jstest: (.*?) *bug:/;
|
||||
($test_result) = $_ =~ /result: (.*?) *type:/;
|
||||
($tmp_test_type) = $_ =~ /type: (.*?) *description:/;
|
||||
|
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -67,8 +67,8 @@ fi
|
|||
|
||||
source ${TEST_BIN}/library.sh
|
||||
|
||||
TEST_JSEACH_TIMEOUT=${TEST_JSEACH_TIMEOUT:-900}
|
||||
TEST_JSEACH_PAGE_TIMEOUT=${TEST_JSEACH_PAGE_TIMEOUT:-840}
|
||||
TEST_JSEACH_TIMEOUT=${TEST_JSEACH_TIMEOUT:-125}
|
||||
TEST_JSEACH_PAGE_TIMEOUT=${TEST_JSEACH_PAGE_TIMEOUT:-120}
|
||||
TEST_JSALL_TIMEOUT=${TEST_JSALL_TIMEOUT:-18000}
|
||||
TEST_WWW_JS=`echo $TEST_JSDIR|sed "s|$TEST_DIR||"`
|
||||
|
||||
|
|
|
@ -68,7 +68,7 @@ fi
|
|||
source ${TEST_BIN}/library.sh
|
||||
|
||||
|
||||
TEST_JSSHELL_TIMEOUT=${TEST_JSSHELL_TIMEOUT:-900}
|
||||
TEST_JSSHELL_TIMEOUT=${TEST_JSSHELL_TIMEOUT:-120}
|
||||
|
||||
#
|
||||
# options processing
|
||||
|
|
Загрузка…
Ссылка в новой задаче