diff options
| author | Andreas Schneider <asn@samba.org> | 2014-09-03 17:16:36 +0200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2014-12-18 06:47:40 +0100 |
| commit | 843d81a14f79803360e8658d224e568435daded6 (patch) | |
| tree | d3e26383d0874eaca02987602594b152c9763c7a /selftest | |
| parent | 064d40f4d30d711797b76082afbb936dcfd9c659 (diff) | |
| download | samba-843d81a14f79803360e8658d224e568435daded6.tar.gz samba-843d81a14f79803360e8658d224e568435daded6.tar.xz samba-843d81a14f79803360e8658d224e568435daded6.zip | |
selftest: Preload resolv_wrapper in selftest.
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'selftest')
| -rwxr-xr-x | selftest/selftest.pl | 11 | ||||
| -rw-r--r-- | selftest/wscript | 1 |
2 files changed, 12 insertions, 0 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index ea63ee528b..166d40aebe 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_libresolv_wrapper_so_path = ""; my $opt_libsocket_wrapper_so_path = ""; my $opt_libuid_wrapper_so_path = ""; my @testlists = (); @@ -200,6 +201,7 @@ Paths: Preload cwrap: --nss_wrapper_so_path=FILE the nss_wrapper library to preload + --resolv_wrapper_so_path=FILE the resolv_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 @@ -243,6 +245,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, + 'resolv_wrapper_so_path=s' => \$opt_libresolv_wrapper_so_path, 'socket_wrapper_so_path=s' => \$opt_libsocket_wrapper_so_path, 'uid_wrapper_so_path=s' => \$opt_libuid_wrapper_so_path ); @@ -350,6 +353,14 @@ if ($opt_libnss_wrapper_so_path) { } } +if ($opt_libresolv_wrapper_so_path) { + if ($ld_preload) { + $ld_preload = "$ld_preload:$opt_libresolv_wrapper_so_path"; + } else { + $ld_preload = "$opt_libresolv_wrapper_so_path"; + } +} + if ($opt_libsocket_wrapper_so_path) { if ($ld_preload) { $ld_preload = "$ld_preload:$opt_libsocket_wrapper_so_path"; diff --git a/selftest/wscript b/selftest/wscript index d1d7425983..fd3c89a0f3 100644 --- a/selftest/wscript +++ b/selftest/wscript @@ -211,6 +211,7 @@ def cmd_testonly(opt): env.SELFTEST_TARGET = "samba3" env.OPTIONS += " --nss_wrapper_so_path=" + CONFIG_GET(opt, 'LIBNSS_WRAPPER_SO_PATH') + env.OPTIONS += " --resolv_wrapper_so_path=" + CONFIG_GET(opt, 'LIBRESOLV_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') |