diff options
| author | Andreas Schneider <asn@samba.org> | 2014-02-13 15:49:27 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2014-04-17 14:56:06 +0200 |
| commit | 0ed826d5087f05993f74cfa280bf1abed14ab161 (patch) | |
| tree | 13d16e8ef87c8e7f6fdedca7f11cd0a49b1bd998 /selftest | |
| parent | 00288191bf343a9382ac49ccf4c86b3bde86e2f8 (diff) | |
| download | samba-0ed826d5087f05993f74cfa280bf1abed14ab161.tar.gz samba-0ed826d5087f05993f74cfa280bf1abed14ab161.tar.xz samba-0ed826d5087f05993f74cfa280bf1abed14ab161.zip | |
selftest: Preload socket_wrapper.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/selftest.pl | 17 | ||||
| -rw-r--r-- | selftest/wscript | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 10cc9fd9b12..97b24ed8658 100755 --- 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 515ca1dfa60..a57f7c17bcf 100644 --- 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). |