From f95e86828a33690f7bb22d320d6781f2b749f8e1 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 3 Jul 2013 14:07:30 +0200 Subject: s4-torture: Remove nss_wrapper testsuite. Signed-off-by: Andreas Schneider Reviewed-by: Stefan Metzmacher --- source3/selftest/tests.py | 2 +- source4/torture/local/local.c | 3 --- source4/torture/local/wscript_build | 4 ---- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py index e64cf77dcd9..4357ed93913 100755 --- a/source3/selftest/tests.py +++ b/source3/selftest/tests.py @@ -306,7 +306,7 @@ rpc = ["rpc.authcontext", "rpc.samba3.bind", "rpc.samba3.srvsvc", "rpc.samba3.sh "rpc.netlogon.admin", "rpc.schannel", "rpc.schannel2", "rpc.bench-schannel1", "rpc.join", "rpc.bind"] -local = ["local.nss-wrapper", "local.ndr"] +local = ["local.ndr"] winbind = ["winbind.struct", "winbind.wbclient", "winbind.pac"] diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c index 681fca1def5..bd47bd3c3fc 100644 --- a/source4/torture/local/local.c +++ b/source4/torture/local/local.c @@ -49,9 +49,6 @@ torture_local_socket, #ifdef SOCKET_WRAPPER torture_local_socket_wrapper, -#endif -#ifdef NSS_WRAPPER - torture_local_nss_wrapper, #endif torture_pac, torture_local_resolve, diff --git a/source4/torture/local/wscript_build b/source4/torture/local/wscript_build index 2fad3746ccc..1b363190b6a 100644 --- a/source4/torture/local/wscript_build +++ b/source4/torture/local/wscript_build @@ -21,10 +21,6 @@ TORTURE_LOCAL_SOURCE = '''../../../lib/util/charset/tests/iconv.c TORTURE_LOCAL_DEPS = 'RPC_NDR_ECHO TDR LIBCLI_SMB MESSAGING iconv POPT_CREDENTIALS TORTURE_AUTH TORTURE_UTIL TORTURE_NDR TORTURE_LIBCRYPTO share torture_registry PROVISION ldb samdb replace-test' -if bld.CONFIG_SET("NSS_WRAPPER"): - TORTURE_LOCAL_SOURCE += " ../../../lib/nss_wrapper/testsuite.c" - TORTURE_LOCAL_DEPS += " nss_wrapper " - if bld.CONFIG_SET("SOCKET_WRAPPER"): TORTURE_LOCAL_SOURCE += " ../../../lib/socket_wrapper/testsuite.c" TORTURE_LOCAL_DEPS += " socket_wrapper" -- cgit