s4-selftest re-enable nsstest on libnss_winbind.so

diff --git a/selftest/skip b/selftest/skip
index 5be321e9ad67d0a6ca0b86f630ee362eed77092f..086efce653a31b8fa26499f3932ce8a4a7b1d52c 100644 (file)
--- a/selftest/skip
+++ b/selftest/skip
@@ -80,7 +80,6 @@
 ^samba4.*.raw.samba3.*                                         # Samba3-specific test
 ^samba4.rpc..*samba3.*                                         # Samba3-specific test
 ^samba4.samba-tool.domopen.*$                          # Hangs for some reason
 ^samba4.*.raw.samba3.*                                         # Samba3-specific test
 ^samba4.rpc..*samba3.*                                         # Samba3-specific test
 ^samba4.samba-tool.domopen.*$                          # Hangs for some reason

-^samba4.nss.test                                               # Fails

 ^samba4.raw.offline                    # Samba 4 doesn't have much offline support yet
 ^samba4.rpc.autoidl  # this one just generates a lot of noise, and is no longer useful
 ^samba4.rpc.countcalls # this is not useful now we have full IDL
 ^samba4.raw.offline                    # Samba 4 doesn't have much offline support yet
 ^samba4.rpc.autoidl  # this one just generates a lot of noise, and is no longer useful
 ^samba4.rpc.countcalls # this is not useful now we have full IDL

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 15ff7a9894c5fd0ae1ff5b990ccf0bd63da4693f..370bce30b6da632841fe879c1377abb648ab6e2a 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -386,7 +386,7 @@ for env in ["dc", "s4member"]:
 
 nsstest4 = binpath("nsstest")
 if os.path.exists(nsstest4):
 
 nsstest4 = binpath("nsstest")
 if os.path.exists(nsstest4):

-    plantestsuite("samba4.nss.test using winbind(s4member)", "s4member", [valgrindify(nsstest4), os.path.join(samba4bindir, "shared/libnss_winbind.so")])
+    plantestsuite("samba4.nss.test using winbind(s4member)", "s4member", [os.path.join(bbdir, "nsstest.sh"), nsstest4, os.path.join(samba4bindir, "default/nsswitch/libnss-winbind.so")])

 else:
     skiptestsuite("samba4.nss.test using winbind(s4member)", "nsstest not available")
 
 else:
     skiptestsuite("samba4.nss.test using winbind(s4member)", "nsstest not available")
 

diff --git a/testprogs/blackbox/nsstest.sh b/testprogs/blackbox/nsstest.sh
new file mode 100755 (executable)
index 0000000..bbca904
--- /dev/null
+++ b/testprogs/blackbox/nsstest.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+# Blackbox wrapper for nsstest
+# Copyright (C) 2006-2007 Jelmer Vernooij <jelmer@samba.org>
+# Copyright (C) 2006-2008 Andrew Bartlett <abartlet@samba.org>
+
+if [ $# -lt 2 ]; then
+cat <<EOF
+Usage: nsstest.sh NSSTEST LIBNSS_WINBIND
+EOF
+exit 1;
+fi
+
+nsstest=$1
+libnss_winbind=$2
+shift 2
+failed=0
+
+. `dirname $0`/subunit.sh
+
+testit "run nsstest" $VALGRIND $nsstest $libnss_winbind || failed=`expr $failed + 1`
+
+exit $failed