libndr: add ndr_push_relative_ptr2_start and ndr_push_relative_ptr2_end.

[abartlet/samba.git/.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index e0ea91d0f224058273afeb9cf7ea0bd6ce947d3d..ba6604961684eb0263afd2255c7d1e1cf8b31018 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -212,6 +212,17 @@ sub cleanup_pcap($$)
        unlink($pcap_file);
 }
 
+# expand strings from %ENV
+sub expand_environment_strings($)
+{
+       my $s = shift;
+       # we use a reverse sort so we do the longer ones first
+       foreach my $k (sort { $b cmp $a } keys %ENV) {
+               $s =~ s/\$$k/$ENV{$k}/g;
+       }
+       return $s;
+}
+
 sub run_testsuite($$$$$)
 {
        my ($envname, $name, $cmd, $i, $totalsuites) = @_;
@@ -255,6 +266,7 @@ sub run_testsuite($$$$$)
        }
 
        print "command: $cmd\n";
+       printf "expanded command: %s\n", expand_environment_strings($cmd);
 
        my $exitcode = $ret >> 8;
 
@@ -348,7 +360,10 @@ exit(1) if (not $result);
 
 ShowHelp() if ($opt_help);
 
-my $tests = shift;
+# we want unbuffered output
+$| = 1;
+
+my @tests = @ARGV;
 
 # quick hack to disable rpc validation when using valgrind - its way too slow
 unless (defined($ENV{VALGRIND})) {
@@ -356,6 +371,9 @@ unless (defined($ENV{VALGRIND})) {
        $ENV{MALLOC_CHECK_} = 2;
 }
 
+# make all our python scripts unbuffered
+$ENV{PYTHONUNBUFFERED} = 1;
+
 my $bindir = ($opt_bindir or "$builddir/bin");
 my $bindir_abs = abs_path($bindir);
 
@@ -427,7 +445,7 @@ if ($opt_socket_wrapper_pcap) {
 
 my $socket_wrapper_dir;
 if ($opt_socket_wrapper) {
-       $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w", $opt_socket_wrapper_pcap);
+       $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix_abs/w", $opt_socket_wrapper_pcap);
        print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
 } else {
         unless ($< == 0) { 
@@ -537,12 +555,18 @@ sub write_clientconf($$)
                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})) {
@@ -563,6 +587,7 @@ sub write_clientconf($$)
        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
@@ -574,6 +599,7 @@ sub write_clientconf($$)
 #We don't want to pass our self-tests if the PAC code is wrong
        gensec:require_pac = true
        modules dir = $ENV{LD_SAMBA_MODULE_PATH}
+       setup directory = ./setup
 ";
        close(CF);
 }
@@ -584,6 +610,20 @@ my $testsdir = "$srcdir/selftest";
 
 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) = @_;
@@ -599,7 +639,7 @@ sub read_testlist($)
                        $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]);
                        }
@@ -814,7 +854,7 @@ if ($opt_testenv) {
 
        my $envvarstr = exported_envvars_str($testenv_vars);
 
-       my $term = ($ENV{TERM} or "xterm");
+       my $term = ($ENV{TERMINAL} or "xterm");
        system("$term -e 'echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'
 
@@ -864,11 +904,8 @@ my $failed = 0;
 # if there were any valgrind failures, show them
 foreach (<$prefix/valgrind.log*>) {
        next unless (-s $_);
-       system("grep DWARF2.CFI.reader $_ > /dev/null");
-       if ($? >> 8 == 0) {
-           print "VALGRIND FAILURE\n";
-           $failed++;
-           system("cat $_");
-       }
+       print "VALGRIND FAILURE\n";
+       $failed++;
+       system("cat $_");
 }
 exit 0;