selftest: Preload socket_wrapper.

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 10cc9fd9b12887cc066727bc7e206f6937b40c08..97b24ed8658a19f3c2f07a41a66ef9e1ae6926e0 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -53,6 +53,7 @@ my $opt_resetup_env = undef;
 my $opt_binary_mapping = "";
 my $opt_load_list = undef;
 my $opt_libnss_wrapper_so_path = "";
+my $opt_libsocket_wrapper_so_path = "";
 my $opt_libuid_wrapper_so_path = "";
 my @testlists = ();
 
@@ -205,6 +206,7 @@ Paths:
 
 Preload cwrap:
  --nss_wrapper_so_path=FILE the nss_wrapper library to preload
+ --socket_wrapper_so_path=FILE the socket_wrapper library to preload
  --uid_wrapper_so_path=FILE the uid_wrapper library to preload
 
 Target Specific:
@@ -247,6 +249,7 @@ my $result = GetOptions (
                'load-list=s' => \$opt_load_list,
                'binary-mapping=s' => \$opt_binary_mapping,
                'nss_wrapper_so_path=s' => \$opt_libnss_wrapper_so_path,
+               'socket_wrapper_so_path=s' => \$opt_libsocket_wrapper_so_path,
                'uid_wrapper_so_path=s' => \$opt_libuid_wrapper_so_path
            );
 
@@ -353,6 +356,14 @@ if ($opt_libnss_wrapper_so_path) {
        }
 }
 
+if ($opt_libsocket_wrapper_so_path) {
+       if ($ld_preload) {
+               $ld_preload = "$ld_preload:$opt_libsocket_wrapper_so_path";
+       } else {
+               $ld_preload = "$opt_libsocket_wrapper_so_path";
+       }
+}
+
 if ($opt_libuid_wrapper_so_path) {
        if ($ld_preload) {
                $ld_preload = "$ld_preload:$opt_libuid_wrapper_so_path";
@@ -408,16 +419,10 @@ if (defined($ENV{SMBD_MAXTIME}) and $ENV{SMBD_MAXTIME} ne "") {
 
 unless ($opt_list) {
        if ($opt_target eq "samba") {
-               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";
                require target::Samba;
                $target = new Samba($bindir, \%binary_mapping, $ldap, $srcdir, $server_maxtime);
        } elsif ($opt_target eq "samba3") {
-               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 = "member";
                require target::Samba3;
                $target = new Samba3($bindir, \%binary_mapping, $srcdir_abs, $server_maxtime);

diff --git a/selftest/wscript b/selftest/wscript
index 515ca1dfa60f39e3adcabedb6a9acf8b3745c3e0..a57f7c17bcf39910b55ec540922cc29112c41c33 100644 (file)
--- a/selftest/wscript
+++ b/selftest/wscript
@@ -201,6 +201,7 @@ def cmd_testonly(opt):
         env.SELFTEST_TARGET="samba3"
 
     env.OPTIONS += " --nss_wrapper_so_path=" + CONFIG_GET(opt, 'LIBNSS_WRAPPER_SO_PATH')
+    env.OPTIONS += " --socket_wrapper_so_path=" + CONFIG_GET(opt, 'LIBSOCKET_WRAPPER_SO_PATH')
     env.OPTIONS += " --uid_wrapper_so_path=" + CONFIG_GET(opt, 'LIBUID_WRAPPER_SO_PATH')
 
     # We use the full path rather than relative path because it cause problems on some plateforms (ie. solaris 8).