arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the bug of processing result

Browse Source
This commit is contained in:
yinle 2014-07-22 16:49:55 -07:00
parent ba99e7cef1
commit 8945dd34c3
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xCAT-server/share/xcat/tools/xCATreg
View File

@ -1420,6 +1420,7 @@ sub pro_result{
}
}
send_msg(2, "done with file $location, total is $total, fail is $fail\n");
close LOGOFAT;
}
send_msg(2, "begin to process failedcases file\n");
@ -1449,19 +1450,20 @@ sub pro_result{
next if ($flag); # old log
# begin to process
if (!open(LOGOFAT, "<$location")) {
if (!open(FAILLOGOFAT, "<$location")) {
send_msg(0, "$mn pro_result can't open failedcases file $location");
return "error";
}
send_msg(2, "begin to process failedcases file $location\n");
while(my $line = <LOGOFAT>) {
if ($line =~ /-----START:(.*)------/){
push @cases, $_;
send_msg(2, "$mn begin to process failedcases file $location\n");
while(my $line = <FAILLOGOFAT>) {
if ($line =~ /-----START:(.*)::(.*)------/){
push @cases, $1;
} else {
next;
}
}
close FAILLOGOFAT;
}
$pass = $total - $fail;
@ -1574,7 +1576,7 @@ if ( !defined($pid) ) {
# step 2. git update
#######################################
send_msg(2, "step 2, Running git_update...............");
#$res = git_update();
$res = git_update();
if ($res) {
send_msg(0, "git_update returns error, child process exit");
syswrite CWRITE,"Failed with git update, child process exit\n";
@ -1771,7 +1773,7 @@ if ( !defined($pid) ) {
close CONTROLREAD;
my $time = time();
while (1) {
print ".";
# print ".";
if(time() - $time > 28800) {
send_mail(0, "!!!xCATreg hangs at running test case and return forcibly");
last; #wait 8 hours at most