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

xcattest modify for loadcase dir

Browse Source
This commit is contained in:
root
2014-06-04 16:26:58 -07:00
parent 4f3bf457a6
commit b51add79a9
1 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
xCAT-test/xcattest
View File

@@ -86,6 +86,7 @@ $ret = &init;
if($ret != 0){
goto EXIT;
}
my @filespath = ();
#loading and check cases
$ret = &loadcase;
if($ret != 0){
@@ -410,6 +411,34 @@ sub uninit
&runcmd("rm -rf /tmp/xCATdbbackup");
return 0;
}
sub Get_Files_Recursive
{
my $dir = $_[0];
foreach $dir (@_)
{
opendir(my $d, $dir) ;
for (;;)
{
my $direntry = readdir($d);
last unless defined $direntry;
next if $direntry =~ m/^\.\w*/;
next if $direntry eq '..';
if ( -d $dir."/".$direntry)
{
Get_Files_Recursive ($dir."/".$direntry);
}
else
{ my $dirpath = $dir.'/'.$direntry."\n";
print $dir.'/'.$direntry."\n";
#print $dir."\n";
push (@filespath, glob("$dirpath"));
}
}
closedir($d);
}
}
sub loadcase
{
@@ -418,14 +447,30 @@ sub loadcase
log_this("******************************");
my $casedir = "/opt/xcat/share/xcat/tools/autotest/testcase";
my @files = ();
if($cmd_list){
my @cmds = split /,/,$cmd_list;
for my $cmd (@cmds){
push (@files, glob("$casedir/$cmd/*"));
}
} else {
@files = glob("$casedir/*/*");
}
#if($cmd_list){
# my @cmds = split /,/,$cmd_list;
# for my $cmd (@cmds){
# push (@files, glob("$casedir/$cmd/*"));
# }
#} else {
# @files = glob("$casedir/*/*");
#}
Get_Files_Recursive("$casedir");
for(my $countfile = 0; $countfile<@filespath; $countfile++)
{
if ($cmd_list){
my @cmds = split /,/,$cmd_list;
for( my $countcmd = 0; $countcmd<@cmds; $countcmd++){
if ($filespath[$countfile] =~ m/\/$cmds[$countcmd]\/case/){
push (@files, glob("$filespath[$countfile]"));
}
}
} else{
push (@files, glob("$filespath[$countfile]"));
}
}
my $file;
my $line;
my $i = 0;