Cleanup test scripts.

This commit is contained in:
b1v1r
2009-09-18 08:34:12 +00:00
parent c8b28800d2
commit dc548f01cf
2 changed files with 642 additions and 640 deletions

View File

@@ -156,7 +156,6 @@ for my $type (@TYPES) {
for my $cfg (sort @cfg) { for my $cfg (sort @cfg) {
runfile($dir, $cfg); runfile($dir, $cfg);
} }
} }
done(); done();
@@ -636,9 +635,12 @@ sub httpd_stop {
unless (defined match_log("error", qr/caught SIG[A-Z]+, shutting down/, 60, "Waiting on httpd to stop: ")) { unless (defined match_log("error", qr/caught SIG[A-Z]+, shutting down/, 60, "Waiting on httpd to stop: ")) {
vrb(join(" ", map { quote_shell($_) } @p)); vrb(join(" ", map { quote_shell($_) } @p));
msg("Httpd server failed to shutdown."); msg("Httpd server failed to shutdown.");
sleep 0.5;
return -1; return -1;
} }
sleep 0.5;
return $rc; return $rc;
} }