wbinfo: Fix up s3 blackbox test. wbinfo no longer needs a config file.

[metze/samba/wip.git] / source3 / script / tests / test_wbinfo_s3.sh

diff --git a/source3/script/tests/test_wbinfo_s3.sh b/source3/script/tests/test_wbinfo_s3.sh
index e3bf1b9e708fa438e3c31e15d5b59e4c41e3bb9b..9758014a3d08ac6fea698f942b14b1f1ebdbb51e 100755 (executable)
--- a/source3/script/tests/test_wbinfo_s3.sh
+++ b/source3/script/tests/test_wbinfo_s3.sh
@@ -14,8 +14,10 @@ password="$4"
 shift 4
 ADDARGS="$*"
 
+test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
 incdir=`dirname $0`
 . $incdir/test_functions.sh
+}
 
 OLDIFS=$IFS;
 
@@ -34,6 +36,8 @@ tests="$tests:--domain-groups"
 tests="$tests:--name-to-sid=$username"
 #Didn't pass yet# tests="$tests:--user-info=$username"
 tests="$tests:--user-groups=$username"
+tests="$tests:--allocate-uid"
+tests="$tests:--allocate-gid"
 
 failed=0
 
@@ -42,7 +46,7 @@ NEWIFS=$':'
 IFS=$NEWIFS
 for t in $tests; do
    IFS=$OLDIFS
-   testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $CONFIGURATION $ADDARGS $t || failed=`expr $failed + 1`
+   testit "wbinfo $t" $VALGRIND $BINDIR/wbinfo $ADDARGS $t || failed=`expr $failed + 1`
    IFS=$NEWIFS
 done
 IFS=$OLDIFS