summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-18 20:28:42 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-18 20:28:42 +0200
commit88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (patch)
treeb41baf32330a3467d824f9279bdc94ab4a73855d /source4
parent1ba033a07079d86c7a9d023ad0c498f188923d2c (diff)
downloadsamba-88ad1a936ccd2451d6dbf542a0a746ad71a3e968.tar.gz
samba-88ad1a936ccd2451d6dbf542a0a746ad71a3e968.tar.bz2
samba-88ad1a936ccd2451d6dbf542a0a746ad71a3e968.zip
Remove EJS tests.
Diffstat (limited to 'source4')
-rw-r--r--source4/samba4-skip1
-rwxr-xr-xsource4/selftest/samba4_tests.sh8
2 files changed, 0 insertions, 9 deletions
diff --git a/source4/samba4-skip b/source4/samba4-skip
index b1313adea0..5fa40ee706 100644
--- a/source4/samba4-skip
+++ b/source4/samba4-skip
@@ -58,6 +58,5 @@ samba4.ntvfs.cifs.raw.
^samba4.net.domopen.*$ # Hangs for some reason
^samba4.net.api.become.dc.*$ # Fails
nss.test # Fails
-samba4.samba3sam.python # Conversion from EJS not yet finished
raw.offline # Samba 4 doesn't have much offline support yet
winreg* #Does not authenticate against the target server
diff --git a/source4/selftest/samba4_tests.sh b/source4/selftest/samba4_tests.sh
index 6f6ffbba60..a13c596f6d 100755
--- a/source4/selftest/samba4_tests.sh
+++ b/source4/selftest/samba4_tests.sh
@@ -60,12 +60,8 @@ $incdir/../bin/smbtorture -V
samba4srcdir=$incdir/..
samba4bindir=$samba4srcdir/bin
-SCRIPTDIR=$samba4srcdir/../testprogs/ejs
smb4torture="$samba4bindir/smbtorture $TORTURE_OPTIONS"
-plantest "js.base" dc "$SCRIPTDIR/base.js" $CONFIGURATION
-plantest "js.ldb" none "$SCRIPTDIR/ldb.js" `pwd` $CONFIGURATION -d 10
-
# Simple tests for LDAP and CLDAP
for options in "" "--option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD --option=socket:testnonblock=true" "-U\$USERNAME%\$PASSWORD"; do
@@ -286,10 +282,6 @@ for t in "BASE-RW1"; do
plantest "ntvfs.simple.`normalize_testname $t`" dc $VALGRIND $smb4torture $ADDARGS //\$SERVER/simple -U"\$USERNAME"%"\$PASSWORD" $t
done
-DATADIR=$samba4srcdir/../testdata
-
-plantest "js.samba3sam" none $samba4bindir/smbscript $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 "$*"