upmerge 58424

This commit is contained in:
Bjorn Munch 2010-11-24 10:47:50 +01:00
commit 222dd6e138

View file

@ -3846,7 +3846,6 @@ sub run_testcase ($) {
# ----------------------------------------------------
# Check if it was an expected crash
# ----------------------------------------------------
SRVDIED:
my $check_crash = check_expected_crash_and_restart($proc);
if ($check_crash)
{
@ -3856,6 +3855,7 @@ sub run_testcase ($) {
next;
}
SRVDIED:
# ----------------------------------------------------
# Stop the test case timer
# ----------------------------------------------------