summaryrefslogtreecommitdiff
path: root/source4/selftest/samba4_tests.sh
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2008-02-12 12:56:30 +1100
committerAndrew Tridgell <tridge@samba.org>2008-02-12 12:56:30 +1100
commitf7bcc15bf8acc157dde8a9895773a0dd03ca6cfb (patch)
tree0bf64d4b2b2183183062392c3f7fd713134af575 /source4/selftest/samba4_tests.sh
parentccc27e681cbd6283513b929d58f2ebce35e6658b (diff)
parente84cd8d38bcb6756c5066c7c75f3220a15e5ad1b (diff)
downloadsamba-f7bcc15bf8acc157dde8a9895773a0dd03ca6cfb.tar.gz
samba-f7bcc15bf8acc157dde8a9895773a0dd03ca6cfb.tar.bz2
samba-f7bcc15bf8acc157dde8a9895773a0dd03ca6cfb.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit 3beaa04ef73ca21925d41745b30b6bbaadb7b939)
Diffstat (limited to 'source4/selftest/samba4_tests.sh')
-rwxr-xr-xsource4/selftest/samba4_tests.sh5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index fba9e8603e..c90373e446 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -262,6 +262,8 @@ done
DATADIR=$samba4srcdir/../testdata
+plantest "js.samba3sam" none $SCRIPTDIR/samba3sam.js $CONFIGURATION `pwd` $DATADIR/samba3/
+
# Domain Member Tests
plantest "RPC-ECHO against member server with local creds" member $VALGRIND $smb4torture ncacn_np:"\$NETBIOSNAME" -U"\$NETBIOSNAME/\$USERNAME"%"\$PASSWORD" RPC-ECHO "$*"
@@ -327,5 +329,6 @@ then
rm -rf $PREFIX/upgrade
plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
rm -rf $PREFIX/provision
- plantest "blackbox.provision.py" none $PYTHON ./setup/provision.py $CONFIGURATION --domain=FOO --realm=foo.example.com --targetdir=$PREFIX/provision
+ mkdir $PREFIX/provision
+ plantest "blackbox.provision.py" none PYTHON="$PYTHON" $samba4srcdir/setup/tests/blackbox_provision.sh "$PREFIX/provision" "$CONFIGURATION"
fi