From cfd5a999da8bbf0c50f430f272a28d8645f0b406 Mon Sep 17 00:00:00 2001 From: hu-weihua Date: Wed, 27 Apr 2016 01:57:00 -0400 Subject: [PATCH] fix bug#977 support running script in xcat test case and modify time calculating method --- xCAT-test/xcattest | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xCAT-test/xcattest b/xCAT-test/xcattest index 5090576f6..7a1da338f 100755 --- a/xCAT-test/xcattest +++ b/xCAT-test/xcattest @@ -592,7 +592,7 @@ sub loadcase }elsif($line =~ /^stop\s*:\s*(\w[\w\,]+)/){ next if $skip; $cases[$i]->{stop}=$1; - }elsif($line =~ /^cmd\s*:\s*([\$\w].+)/){ + }elsif($line =~ /^cmd\s*:\s*([\/\$\w].+)/){ next if $skip; $j = $j + 1; $z = 0; @@ -740,7 +740,7 @@ sub runcase $j = 0; $total = $total + 1; my $now1=timelocal(localtime()); - my $time1=gmtime $now1; + my $time1=scalar(localtime()); log_this("------START:$$case{name}::Time:$time1------"); push @record, "------START:$$case{name}::Time:$time1------"; push @record, "FILENAME:$$case{filename}"; @@ -855,7 +855,7 @@ sub runcase $j = $j + 1; } my $now2=timelocal(localtime()); - my $time2=gmtime $now2; + my $time2 = scalar(localtime()); my $diff=$now2-$now1; if($failed){ log_this("------END::$$case{name}::Failed::Time:$time2 ::Duration::$diff sec------");