Remove EJS tests.

diff --git a/source4/samba4-skip b/source4/samba4-skip
index b1313adea0cf63918bcc38503379fbd4028145f4..5fa40ee70664704f6819d8ac882513734cb70ea9 100644 (file)
--- 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 6f6ffbba6023291751314eb9e31f517256a57233..a13c596f6d81391a2e5cd4e9e2c9674cffcceb30 100755 (executable)
--- 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 "$*"