summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim McDonough <jmcd@samba.org>2008-06-12 07:06:07 -0400
committerJim McDonough <jmcd@samba.org>2008-06-12 07:06:07 -0400
commitf3fb381952e6afd4b3d15758eaf3aaf29a112eec (patch)
tree92a33bc49f256dbb68e3b47a1e92ecb6e2d177f6
parent0410dcb32d772ee5022bd3bb507a5650ef6c5071 (diff)
downloadsamba-f3fb381952e6afd4b3d15758eaf3aaf29a112eec.tar.gz
samba-f3fb381952e6afd4b3d15758eaf3aaf29a112eec.tar.bz2
samba-f3fb381952e6afd4b3d15758eaf3aaf29a112eec.zip
Missed these on the last commit
(This used to be commit 0e8f946ed02a6d2d9469f9ccab5f3342b2b80725)
-rwxr-xr-xsource4/selftest/samba4_tests.sh1
-rw-r--r--testprogs/blackbox/wintest/wintest.conf6
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 1d550cbfe1..e9fbede4fb 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -279,6 +279,7 @@ plantest "blackbox.masktest" dc $bbdir/test_masktest.sh "\$SERVER" "\$USERNAME"
plantest "blackbox.gentest" dc $bbdir/test_gentest.sh "\$SERVER" "\$USERNAME" "\$PASSWORD" "\$DOMAIN" "$PREFIX"
plantest "blackbox.wbinfo" dc $bbdir/test_wbinfo.sh "\$DOMAIN" "\$USERNAME" "\$PASSWORD" "dc"
plantest "blackbox.wbinfo" member $bbdir/test_wbinfo.sh "\$DOMAIN" "\$DC_USERNAME" "\$DC_PASSWORD" "member"
+plantest "blackbox.wintest" none $bbdir/test_wintest.sh "$TORTURE_OPTIONS"
# Tests using the "Simple" NTVFS backend
diff --git a/testprogs/blackbox/wintest/wintest.conf b/testprogs/blackbox/wintest/wintest.conf
index d52e660318..d1403662f9 100644
--- a/testprogs/blackbox/wintest/wintest.conf
+++ b/testprogs/blackbox/wintest/wintest.conf
@@ -1,6 +1,6 @@
-#export WINTEST_STARTUP=/tmp/blah
-#export WINTEST_SHUTDOWN=/tmp/blah2
-export DOMAIN="wait"
+#export WINTEST_STARTUP="/tmp/startup client"
+#export WINTEST_SHUTDOWN=/tmp/shutdown client"
+export DOMAIN="client"
export USERNAME="administrator"
export PASSWORD="samba"
export SERVER="192.168.213.161"