summaryrefslogtreecommitdiff
path: root/source4/selftest
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-11 18:26:28 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-11 18:26:28 +0100
commit5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c (patch)
treea4032b21532f29b956b1bd08c3b2647251939d64 /source4/selftest
parenta19534d2072ca7dc4c70767d02db58503678cfaa (diff)
parent98fdbb61260b19bc97675336993f3fcb5f470f90 (diff)
downloadsamba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.tar.gz
samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.tar.bz2
samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts: source/Makefile source/rules.mk (This used to be commit fc9b9853124c8d172172f88e1e4939db5970df25)
Diffstat (limited to 'source4/selftest')
-rwxr-xr-xsource4/selftest/samba4_tests.sh3
1 files changed, 0 insertions, 3 deletions
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index c2ce9dc6f1..fba9e8603e 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -262,9 +262,6 @@ done
DATADIR=$samba4srcdir/../testdata
-plantest "parse samba3" none $samba4bindir/smbscript $DATADIR/samba3/verify $CONFIGURATION $DATADIR/samba3
-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 "$*"