my ($envname, $name, $cmd, $i, $totalsuites) = @_;
my $pcap_file = setup_pcap($name);
- Subunit::report_time(time());
Subunit::start_testsuite($name);
+ Subunit::report_time(time());
open(RESULTS, "$cmd 2>&1|");
my $statistics = {
ShowHelp() if ($opt_help);
-my $tests = shift;
+my @tests = @ARGV;
# quick hack to disable rpc validation when using valgrind - its way too slow
unless (defined($ENV{VALGRIND})) {
mkdir("$prefix/client/private", 0777);
}
- if ( -d "$prefix/client/lock" ) {
+ if ( -d "$prefix/client/lockdir" ) {
unlink <$prefix/client/lockdir/*>;
} else {
mkdir("$prefix/client/lockdir", 0777);
}
+ if ( -d "$prefix_abs/client/ncalrpcdir" ) {
+ unlink <$prefix/client/ncalrpcdir/*>;
+ } else {
+ mkdir("$prefix/client/ncalrpcdir", 0777);
+ }
+
open(CF, ">$conffile");
print CF "[global]\n";
if (defined($ENV{VALGRIND})) {
print CF "
private dir = $prefix_abs/client/private
lock dir = $prefix_abs/client/lockdir
+ ncalrpc dir = $prefix_abs/client/ncalrpcdir
name resolve order = bcast
panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
max xmit = 32K
my %required_envs = ();
+sub should_run_test($)
+{
+ my $name = shift;
+ if ($#tests == -1) {
+ return 1;
+ }
+ for (my $i=0; $i <= $#tests; $i++) {
+ if ($name =~ /$tests[$i]/i) {
+ return 1;
+ }
+ }
+ return 0;
+}
+
sub read_testlist($)
{
my ($filename) = @_;
$env =~ s/\n//g;
my $cmdline = <IN>;
$cmdline =~ s/\n//g;
- if (not defined($tests) or $name =~ /$tests/) {
+ if (should_run_test($name) == 1) {
$required_envs{$env} = 1;
push (@ret, [$name, $env, $cmdline]);
}