Changeset 740 for vendor/current/selftest/selftest.pl

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/selftest/selftest.pl (modified) (37 diffs)

vendor/current/selftest/selftest.pl

@@ -1 +1 @@
 #!/usr/bin/perl
 # Bootstrap Samba and run a number of tests against it.
-# Copyright (C) 2005-2009 Jelmer Vernooij <jelmer@samba.org>
+# Copyright (C) 2005-2010 Jelmer Vernooij <jelmer@samba.org>
 # Copyright (C) 2007-2009 Stefan Metzmacher <metze@samba.org>
 
@@ -126 +126 @@
 use FindBin qw($RealBin $Script);
 use File::Spec;
+use File::Temp qw(tempfile);
 use Getopt::Long;
 use POSIX;
 use Cwd qw(abs_path);
 use lib "$RealBin";
-use Subunit qw(parse_results);
-use Subunit::Filter;
+use Subunit;
 use SocketWrapper;
+
+eval {
+require Time::HiRes;
+Time::HiRes->import("time");
+};
+if ($@) {
+        print "You don't have Time::Hires installed !\n";
+}
 
 my $opt_help = 0;
@@ -146 +154 @@
 my $opt_image = undef;
 my $opt_testenv = 0;
+my $opt_list = 0;
 my $ldap = undef;
-my $opt_analyse_cmd = undef;
 my $opt_resetup_env = undef;
 my $opt_bindir = undef;
-my $opt_no_lazy_setup = undef;
+my $opt_load_list = undef;
 my @testlists = ();
 
@@ -161 +169 @@
 my @excludes = ();
 
+sub pipe_handler {
+        my $sig = shift @_;
+        print STDERR "Exiting early because of SIGPIPE.\n";
+        exit(1);
+}
+
+$SIG{PIPE} = \&pipe_handler;
+
 sub find_in_list($$)
 {
@@ -213 +229 @@
 }
 
+# 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($$$$$)
 {
@@ -219 +246 @@
 
         Subunit::start_testsuite($name);
+        Subunit::progress_push();
         Subunit::report_time(time());
-
-        open(RESULTS, "$cmd 2>&1|");
-        my $statistics = {
-                TESTS_UNEXPECTED_OK => 0,
-                TESTS_EXPECTED_OK => 0,
-                TESTS_UNEXPECTED_FAIL => 0,
-                TESTS_EXPECTED_FAIL => 0,
-                TESTS_ERROR => 0,
-                TESTS_SKIP => 0,
-        };
-
-        my $msg_ops = new Subunit::Filter("$name\.", []);
-
-        parse_results($msg_ops, $statistics, *RESULTS);
-
-        my $ret = 0;
-
-        unless (close(RESULTS)) {
-                if ($!) {
-                        Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
-                        return 0;
-                } else {
-                        $ret = $?;
-                }
-        } 
-
-        if ($ret & 127) {
-                Subunit::end_testsuite($name, "error", sprintf("Testsuite died with signal %d, %s coredump", ($ret & 127), ($ret & 128) ? "with": "without"));
-                return 0;
-        }
+        system($cmd);
+        Subunit::report_time(time());
+        Subunit::progress_pop();
+
+        if ($? == -1) {
+                Subunit::progress_pop();
+                Subunit::end_testsuite($name, "error", "Unable to run $cmd: $!");
+                exit(1);
+        } elsif ($? & 127) {
+                Subunit::end_testsuite($name, "error",
+                        sprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
+                exit(1);
+        }
+
+        my $exitcode = $? >> 8;
+
         my $envlog = getlog_env($envname);
         if ($envlog ne "") {
@@ -256 +270 @@
 
         print "command: $cmd\n";
-
-        my $exitcode = $ret >> 8;
-
-        Subunit::report_time(time());
+        printf "expanded command: %s\n", expand_environment_strings($cmd);
+
         if ($exitcode == 0) {
                 Subunit::end_testsuite($name, "success");
@@ -315 +327 @@
  --one                      abort when the first test fails
  --verbose                  be verbose
- --analyse-cmd CMD          command to run after each test
+ --testenv                  run a shell in the requested test environment
+ --list                     list available tests
 ";
         exit(0);
@@ -336 +349 @@
                 'verbose' => \$opt_verbose,
                 'testenv' => \$opt_testenv,
+                'list' => \$opt_list,
                 'ldap:s' => \$ldap,
-                'analyse-cmd=s' => \$opt_analyse_cmd,
-                'no-lazy-setup' => \$opt_no_lazy_setup,
                 'resetup-environment' => \$opt_resetup_env,
                 'bindir:s' => \$opt_bindir,
                 'image=s' => \$opt_image,
-                'testlist=s' => \@testlists
+                'testlist=s' => \@testlists,
+                'load-list=s' => \$opt_load_list,
             );
 
@@ -348 +361 @@
 
 ShowHelp() if ($opt_help);
+
+die("--list and --testenv are mutually exclusive") if ($opt_list and $opt_testenv);
+
+# we want unbuffered output
+$| = 1;
 
 my @tests = @ARGV;
@@ -356 +374 @@
         $ENV{MALLOC_CHECK_} = 2;
 }
+
+# make all our python scripts unbuffered
+$ENV{PYTHONUNBUFFERED} = 1;
 
 my $bindir = ($opt_bindir or "$builddir/bin");
@@ -385 +406 @@
 
 my $prefix_abs = abs_path($prefix);
+my $tmpdir_abs = abs_path("$prefix/tmp");
+mkdir($tmpdir_abs, 0777) unless -d $tmpdir_abs;
+
 my $srcdir_abs = abs_path($srcdir);
 my $builddir_abs = abs_path($builddir);
@@ -398 +422 @@
 $ENV{BUILDDIR} = $builddir;
 $ENV{BUILDDIR_ABS} = $builddir_abs;
+$ENV{BINDIR} = $bindir_abs;
 $ENV{EXEEXT} = $exeext;
 
 my $tls_enabled = not $opt_quick;
 $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no");
-$ENV{LDB_MODULES_PATH} = "$bindir_abs/modules/ldb";
-$ENV{LD_SAMBA_MODULE_PATH} = "$bindir_abs/modules";
+
 sub prefix_pathvar($$)
 {
@@ -428 +452 @@
 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 {
@@ -440 +464 @@
 
 if ($opt_target eq "samba4") {
-        $testenv_default = "member";
+        $testenv_default = "all";
         require target::Samba4;
-        $target = new Samba4($bindir, $ldap, "$srcdir/setup", $exeext);
+        $target = new Samba4($bindir, $ldap, $srcdir, $exeext);
 } elsif ($opt_target eq "samba3") {
         if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
@@ -449 +473 @@
         $testenv_default = "member";
         require target::Samba3;
-        $target = new Samba3($bindir);
+        $target = new Samba3($bindir, $srcdir_abs);
 } elsif ($opt_target eq "win") {
         die("Windows tests will not run with socket wrapper enabled.") 
@@ -516 +540 @@
 }
 
-my $interfaces = join(',', ("127.0.0.6/8", 
-                            "127.0.0.7/8",
-                            "127.0.0.8/8",
-                            "127.0.0.9/8",
-                            "127.0.0.10/8",
-                            "127.0.0.11/8"));
-
-my $conffile = "$prefix_abs/client/client.conf";
+my $interfaces = join(',', ("127.0.0.11/8",
+                            "127.0.0.12/8",
+                            "127.0.0.13/8",
+                            "127.0.0.14/8",
+                            "127.0.0.15/8",
+                            "127.0.0.16/8"));
+
+my $clientdir = "$prefix_abs/client";
+
+my $conffile = "$clientdir/client.conf";
 $ENV{SMB_CONF_PATH} = $conffile;
 
-sub write_clientconf($$)
-{
-        my ($conffile, $vars) = @_;
-
-        mkdir("$prefix/client", 0777) unless -d "$prefix/client";
-        
-        if ( -d "$prefix/client/private" ) {
-                unlink <$prefix/client/private/*>;
+sub write_clientconf($$$)
+{
+        my ($conffile, $clientdir, $vars) = @_;
+
+        mkdir("$clientdir", 0777) unless -d "$clientdir";
+
+        if ( -d "$clientdir/private" ) {
+                unlink <$clientdir/private/*>;
         } else {
-                mkdir("$prefix/client/private", 0777);
-        }
-
-        if ( -d "$prefix/client/lockdir" ) {
-                unlink <$prefix/client/lockdir/*>;
+                mkdir("$clientdir/private", 0777);
+        }
+
+        if ( -d "$clientdir/lockdir" ) {
+                unlink <$clientdir/lockdir/*>;
         } else {
-                mkdir("$prefix/client/lockdir", 0777);
-        }
-
-        if ( -d "$prefix_abs/client/ncalrpcdir" ) {
-                unlink <$prefix/client/ncalrpcdir/*>;
+                mkdir("$clientdir/lockdir", 0777);
+        }
+
+        if ( -d "$clientdir/ncalrpcdir" ) {
+                unlink <$clientdir/ncalrpcdir/*>;
         } else {
-                mkdir("$prefix/client/ncalrpcdir", 0777);
+                mkdir("$clientdir/ncalrpcdir", 0777);
         }
 
@@ -568 +594 @@
         }
         print CF "
-        private dir = $prefix_abs/client/private
-        lock dir = $prefix_abs/client/lockdir
-        ncalrpc dir = $prefix_abs/client/ncalrpcdir
-        name resolve order = bcast
+        private dir = $clientdir/private
+        lock dir = $clientdir/lockdir
+        ncalrpc dir = $clientdir/ncalrpcdir
+        name resolve order = bcast file
         panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
         max xmit = 32K
@@ -578 +604 @@
         system:anonymous = true
         client lanman auth = Yes
-        torture:basedir = $prefix_abs/client
+        log level = 1
+        torture:basedir = $clientdir
 #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}
+        resolv:host file = $prefix_abs/dns_host_file
+#We don't want to run 'speed' tests for very long
+        torture:timelimit = 1
 ";
         close(CF);
@@ -587 +616 @@
 
 my @todo = ();
-
-my $testsdir = "$srcdir/selftest";
-
-my %required_envs = ();
 
 sub should_run_test($)
@@ -614 +639 @@
 
         while (<IN>) {
-                if ($_ eq "-- TEST --\n") {
+                if (/-- TEST(-LOADLIST|-IDLIST|) --\n/) {
+                        my $supports_loadlist = (defined($1) and $1 eq "-LOADLIST");
+                        my $supports_idlist = (defined($1) and $1 eq "-IDLIST");
                         my $name = <IN>;
                         $name =~ s/\n//g;
@@ -622 +649 @@
                         $cmdline =~ s/\n//g;
                         if (should_run_test($name) == 1) {
-                                $required_envs{$env} = 1;
-                                push (@ret, [$name, $env, $cmdline]);
+                                push (@ret, [$name, $env, $cmdline, $supports_loadlist, $supports_idlist]);
                         }
                 } else {
@@ -638 +664 @@
 
 $ENV{SELFTEST_PREFIX} = "$prefix_abs";
+$ENV{SELFTEST_TMPDIR} = "$tmpdir_abs";
+$ENV{TEST_DATA_PREFIX} = "$tmpdir_abs";
 if ($opt_socket_wrapper) {
         $ENV{SELFTEST_INTERFACES} = $interfaces;
@@ -665 +693 @@
 }
 
-Subunit::testsuite_count($#available+1);
-Subunit::report_time(time());
-
-foreach (@available) {
-        my $name = $$_[0];
+my $restricted = undef;
+my $restricted_used = {};
+
+if ($opt_load_list) {
+        $restricted = [];
+        open(LOAD_LIST, "<$opt_load_list") or die("Unable to open $opt_load_list");
+        while (<LOAD_LIST>) {
+                chomp;
+                push (@$restricted, $_);
+        }
+        close(LOAD_LIST);
+}
+
+my $individual_tests = undef;
+$individual_tests = {};
+
+foreach my $testsuite (@available) {
+        my $name = $$testsuite[0];
         my $skipreason = skip($name);
-        if (defined($skipreason)) {
+        if (defined($restricted)) {
+                # Find the testsuite for this test
+                my $match = undef;
+                foreach my $r (@$restricted) {
+                        if ($r eq $name) {
+                                $individual_tests->{$name} = [];
+                                $match = $r;
+                                $restricted_used->{$r} = 1;
+                        } elsif (substr($r, 0, length($name)+1) eq "$name.") {
+                                push(@{$individual_tests->{$name}}, $r);
+                                $match = $r;
+                                $restricted_used->{$r} = 1;
+                        }
+                }
+                if ($match) {
+                        if (defined($skipreason)) {
+                                        Subunit::skip_testsuite($name, $skipreason);
+                        } else {
+                                push(@todo, $testsuite);
+                        }
+                }
+        } elsif (defined($skipreason)) {
                 Subunit::skip_testsuite($name, $skipreason);
         } else {
-                push(@todo, $_); 
-        }
-}
-
-if ($#todo == -1) {
+                push(@todo, $testsuite);
+        }
+}
+
+if (defined($restricted)) {
+        foreach (@$restricted) {
+                unless (defined($restricted_used->{$_})) {
+                        print "No test or testsuite found matching $_\n";
+                }
+        }
+} elsif ($#todo == -1) {
         print STDERR "No tests to run\n";
         exit(1);
-        }
+}
 
 my $suitestotal = $#todo + 1;
+
+Subunit::progress($suitestotal);
+Subunit::report_time(time());
+
 my $i = 0;
 $| = 1;
@@ -711 +783 @@
         "DC_NETBIOSALIAS",
 
+        # domain member
+        "MEMBER_SERVER",
+        "MEMBER_SERVER_IP",
+        "MEMBER_NETBIOSNAME",
+        "MEMBER_NETBIOSALIAS",
+
+        # rpc proxy controller stuff
+        "RPC_PROXY_SERVER",
+        "RPC_PROXY_SERVER_IP",
+        "RPC_PROXY_NETBIOSNAME",
+        "RPC_PROXY_NETBIOSALIAS",
+
+        # domain controller stuff for Vampired DC
+        "VAMPIRE_DC_SERVER",
+        "VAMPIRE_DC_SERVER_IP",
+        "VAMPIRE_DC_NETBIOSNAME",
+        "VAMPIRE_DC_NETBIOSALIAS",
+
         # server stuff
         "SERVER",
@@ -719 +809 @@
         # user stuff
         "USERNAME",
+        "USERID",
         "PASSWORD",
         "DC_USERNAME",
@@ -726 +817 @@
         "KRB5_CONFIG",
         "WINBINDD_SOCKET_DIR",
-        "WINBINDD_PRIV_PIPE_DIR"
+        "WINBINDD_PRIV_PIPE_DIR",
+        "NMBD_SOCKET_DIR",
+        "LOCAL_PATH"
 );
 
@@ -735 +828 @@
 };
 
-sub setup_env($)
-{
-        my ($name) = @_;
+sub setup_env($$)
+{
+        my ($name, $prefix) = @_;
 
         my $testenv_vars = undef;
@@ -754 +847 @@
         } elsif (defined(get_running_env($envname))) {
                 $testenv_vars = get_running_env($envname);
-                if (not $target->check_env($testenv_vars)) {
+                if (not $testenv_vars->{target}->check_env($testenv_vars)) {
+                        print $testenv_vars->{target}->getlog_env($testenv_vars);
                         $testenv_vars = undef;
                 }
         } else {
                 $testenv_vars = $target->setup_env($envname, $prefix);
+                if (defined($testenv_vars) && not defined($testenv_vars->{target})) {
+                       $testenv_vars->{target} = $target;
+                }
         }
 
@@ -769 +866 @@
                 $ENV{SMB_CONF_PATH} = $testenv_vars->{SERVERCONFFILE};
         } elsif ($option eq "client") {
-                SocketWrapper::set_default_iface(6);
-                write_clientconf($conffile, $testenv_vars);
+                SocketWrapper::set_default_iface(11);
+                write_clientconf($conffile, $clientdir, $testenv_vars);
                 $ENV{SMB_CONF_PATH} = $conffile;
         } else {
@@ -804 +901 @@
         my ($envname) = @_;
         return "" if ($envname eq "none");
-        return $target->getlog_env(get_running_env($envname));
+        my $env = get_running_env($envname);
+        return $env->{target}->getlog_env($env);
 }
 
@@ -811 +909 @@
         my ($envname) = @_;
         return 1 if ($envname eq "none");
-        return $target->check_env(get_running_env($envname));
+        my $env = get_running_env($envname);
+        return $env->{target}->check_env($env);
 }
 
@@ -818 +917 @@
         my ($envname) = @_;
         return if ($envname eq "none");
-        $target->teardown_env(get_running_env($envname));
+        my $env = get_running_env($envname);
+        $env->{target}->teardown_env($env);
         delete $running_envs{$envname};
 }
 
-if ($opt_no_lazy_setup) {
-        setup_env($_) foreach (keys %required_envs);
-}
+# This 'global' file needs to be empty when we start
+unlink("$prefix_abs/dns_host_file");
 
 if ($opt_testenv) {
@@ -830 +929 @@
         $testenv_name = $testenv_default unless defined($testenv_name);
 
-        my $testenv_vars = setup_env($testenv_name);
+        my $testenv_vars = setup_env($testenv_name, $prefix);
+
+        die("Unable to setup environment $testenv_name") unless ($testenv_vars);
 
         $ENV{PIDDIR} = $testenv_vars->{PIDDIR};
+        $ENV{ENVNAME} = $testenv_name;
 
         my $envvarstr = exported_envvars_str($testenv_vars);
 
-        my $term = ($ENV{TERM} or "xterm");
-        system("$term -e 'echo -e \"
+        my $term = ($ENV{TERMINAL} or "xterm -e");
+        system("$term 'echo -e \"
 Welcome to the Samba4 Test environment '$testenv_name'
 
@@ -850 +952 @@
 \" && LD_LIBRARY_PATH=$ENV{LD_LIBRARY_PATH} bash'");
         teardown_env($testenv_name);
+} elsif ($opt_list) {
+        foreach (@todo) {
+                my $cmd = $$_[2];
+                my $name = $$_[0];
+                my $envname = $$_[1];
+
+                unless($cmd =~ /\$LISTOPT/) {
+                        warn("Unable to list tests in $name");
+                        next;
+                }
+
+                $cmd =~ s/\$LISTOPT/--list/g;
+
+                system($cmd);
+
+                if ($? == -1) {
+                        die("Unable to run $cmd: $!");
+                } elsif ($? & 127) {
+                        die(snprintf("%s died with signal %d, %s coredump\n", $cmd, ($? & 127),  ($? & 128) ? 'with' : 'without'));
+                }
+
+                my $exitcode = $? >> 8;
+                if ($exitcode != 0) {
+                        die("$cmd exited with exit code $exitcode");
+                }
+        }
 } else {
         foreach (@todo) {
                 $i++;
                 my $cmd = $$_[2];
-                $cmd =~ s/([\(\)])/\\$1/g;
                 my $name = $$_[0];
                 my $envname = $$_[1];
-                
-                my $envvars = setup_env($envname);
+
+                my $envvars = setup_env($envname, $prefix);
                 if (not defined($envvars)) {
-                        Subunit::skip_testsuite($name, 
-                                "unable to set up environment $envname");
+                        Subunit::start_testsuite($name);
+                        Subunit::end_testsuite($name, "error",
+                                "unable to set up environment $envname - exiting");
                         next;
                 }
 
+                # Generate a file with the individual tests to run, if the 
+                # test runner for this test suite supports it.
+                if ($individual_tests and $individual_tests->{$name}) {
+                        if ($$_[3]) {
+                                my ($fh, $listid_file) = tempfile(UNLINK => 0);
+                                foreach my $test (@{$individual_tests->{$name}}) {
+                                        print $fh substr($test, length($name)+1) . "\n";
+                                }
+                                $cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
+                        } elsif ($$_[4]) {
+                                $cmd =~ s/\s+[^\s]+\s*$//;
+                                $cmd .= " " . join(' ', @{$individual_tests->{$name}});
+                        }
+                }
+
                 run_testsuite($envname, $name, $cmd, $i, $suitestotal);
 
-                if (defined($opt_analyse_cmd)) {
-                        system("$opt_analyse_cmd \"$name\"");
-                }
-
                 teardown_env($envname) if ($opt_resetup_env);
         }
@@ -878 +1017 @@
 
 teardown_env($_) foreach (keys %running_envs);
-
-$target->stop();
 
 my $failed = 0;
@@ -886 +1023 @@
 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;