selftest: add "member" environment for Samba3

[metze/samba/wip.git] / selftest / selftest.pl

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 60eabe41d6669a86c502a726aec9f996b7428072..97cf6971790385dfc7b3967c2808f56cf0b16748 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -13,7 +13,7 @@ selftest - Samba test runner
 
 selftest --help
 
-selftest [--srcdir=DIR] [--builddir=DIR] [--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--immediate] [--testlist=FILE] [TESTS]
+selftest [--srcdir=DIR] [--builddir=DIR] [--exeext=EXT][--target=samba4|samba3|win|kvm] [--socket-wrapper] [--quick] [--exclude=FILE] [--include=FILE] [--one] [--prefix=prefix] [--immediate] [--testlist=FILE] [TESTS]
 
 =head1 DESCRIPTION
 
@@ -35,6 +35,10 @@ Source directory.
 
 Build directory.
 
+=item I<--exeext=EXT>
+
+Executable extention
+
 =item I<--prefix=DIR>
 
 Change directory to run tests in. Default is 'st'.
@@ -156,6 +160,7 @@ my @testlists = ();
 
 my $srcdir = ".";
 my $builddir = ".";
+my $exeext = "";
 my $prefix = "./st";
 
 my @expected_failures = ();
@@ -294,20 +299,19 @@ Paths:
  --prefix=DIR               prefix to run tests in [st]
  --srcdir=DIR               source directory [.]
  --builddir=DIR             output directory [.]
+ --exeext=EXT               executable extention []
 
 Target Specific:
  --socket-wrapper-pcap     save traffic to pcap directories
  --socket-wrapper-keep-pcap keep all pcap files, not just those for tests that 
                             failed
  --socket-wrapper           enable socket wrapper
+ --bindir=PATH              path to target binaries
  --expected-failures=FILE   specify list of tests that is guaranteed to fail
 
 Samba4 Specific:
  --ldap=openldap|fedora-ds  back samba onto specified ldap server
 
-Samba3 Specific:
- --bindir=PATH              path to binaries
-
 Kvm Specific:
  --image=PATH               path to KVM image
 
@@ -336,6 +340,7 @@ my $result = GetOptions (
                'include=s' => \@opt_include,
                'srcdir=s' => \$srcdir,
                'builddir=s' => \$builddir,
+               'exeext=s' => \$exeext,
                'verbose' => \$opt_verbose,
                'testenv' => \$opt_testenv,
                'ldap:s' => \$ldap,
@@ -434,7 +439,9 @@ if ($opt_socket_wrapper) {
        $socket_wrapper_dir = SocketWrapper::setup_dir("$prefix/w", $opt_socket_wrapper_pcap);
        print "SOCKET_WRAPPER_DIR=$socket_wrapper_dir\n";
 } else {
-       warn("Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports") unless $< == 0;
+        unless ($< == 0) { 
+                print "WARNING: Not using socket wrapper, but also not running as root. Will not be able to listen on proper ports\n";
+        }
 }
 
 my $target;
@@ -443,14 +450,16 @@ my $testenv_default = "none";
 if ($opt_target eq "samba4") {
        $testenv_default = "member";
        require target::Samba4;
-       $target = new Samba4($opt_bindir or "$srcdir/bin", $ldap, "$srcdir/setup");
+       $target = new Samba4($opt_bindir or "$builddir/bin",
+                            $ldap, "$srcdir/setup", $exeext);
 } elsif ($opt_target eq "samba3") {
-       if ($opt_socket_wrapper and `$opt_bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
+       my $bindir = ($opt_bindir or "$builddir/bin");
+       if ($opt_socket_wrapper and `$bindir/smbd -b | grep SOCKET_WRAPPER` eq "") {
                die("You must include --enable-socket-wrapper when compiling Samba in order to execute 'make test'.  Exiting....");
        }
-       $testenv_default = "dc";
+       $testenv_default = "member";
        require target::Samba3;
-       $target = new Samba3($opt_bindir);
+       $target = new Samba3($bindir);
 } elsif ($opt_target eq "win") {
        die("Windows tests will not run with socket wrapper enabled.") 
                if ($opt_socket_wrapper);
@@ -517,10 +526,6 @@ foreach (@opt_exclude) {
        push (@excludes, read_test_regexes($_));
 }
 
-if ($opt_quick) {
-       push (@includes, read_test_regexes("samba4-quick"));
-}
-
 foreach (@opt_include) {
        push (@includes, read_test_regexes($_));
 }
@@ -547,6 +552,12 @@ sub write_clientconf($$)
                mkdir("$prefix/client/private", 0777);
        }
 
+       if ( -d "$prefix/client/lock" ) {
+               unlink <$prefix/client/lockdir/*>;
+       } else {
+               mkdir("$prefix/client/lockdir", 0777);
+       }
+
        open(CF, ">$conffile");
        print CF "[global]\n";
        if (defined($ENV{VALGRIND})) {
@@ -569,18 +580,21 @@ sub write_clientconf($$)
        }
        if (defined($vars->{WINBINDD_SOCKET_DIR})) {
                print CF "\twinbindd socket directory = $vars->{WINBINDD_SOCKET_DIR}\n";
+               print CF "\twinbindd:socket dir = $vars->{WINBINDD_SOCKET_DIR}\n";
        }
        if ($opt_socket_wrapper) {
                print CF "\tinterfaces = $interfaces\n";
        }
        print CF "
        private dir = $prefix_abs/client/private
+       lock dir = $prefix_abs/client/lockdir
        name resolve order = bcast
-       panic action = $srcdir_abs/script/gdb_backtrace \%PID\% \%PROG\%
+       panic action = $RealBin/gdb_backtrace \%PID\% \%PROG\%
        max xmit = 32K
        notify:inotify = false
        ldb:nosync = true
        system:anonymous = true
+       client lanman auth = Yes
        torture:basedir = $prefix_abs/client
 #We don't want to pass our self-tests if the PAC code is wrong
        gensec:require_pac = true