diff options
| -rwxr-xr-x | source4/script/tests/test_ldap.sh | 10 | ||||
| -rwxr-xr-x | source4/script/tests/test_quick.sh | 4 | ||||
| -rwxr-xr-x | source4/script/tests/test_rpc_quick.sh | 4 |
3 files changed, 11 insertions, 7 deletions
diff --git a/source4/script/tests/test_ldap.sh b/source4/script/tests/test_ldap.sh index 3c7fa3eb3d..204ac00d5a 100755 --- a/source4/script/tests/test_ldap.sh +++ b/source4/script/tests/test_ldap.sh @@ -84,9 +84,13 @@ done testit "CLDAP" bin/smbtorture $TORTURE_OPTIONS //$SERVER/_none_ LDAP-CLDAP || failed=`expr $failed + 1` -LDBDIR=lib/ldb -export LDBDIR -testit "ldb tests" $LDBDIR/tests/test-tdb.sh || failed=`expr $failed + 1` +# only do the ldb tests when not in quick mode - they are quite slow, and ldb +# is now pretty well tested by the rest of the quick tests anyway +test "$TORTURE_QUICK" = "yes" || { + LDBDIR=lib/ldb + export LDBDIR + testit "ldb tests" $LDBDIR/tests/test-tdb.sh || failed=`expr $failed + 1` +} SCRIPTDIR=../testprogs/ejs diff --git a/source4/script/tests/test_quick.sh b/source4/script/tests/test_quick.sh index 063aa95552..6f6e01e5a5 100755 --- a/source4/script/tests/test_quick.sh +++ b/source4/script/tests/test_quick.sh @@ -19,9 +19,9 @@ incdir=`dirname $0` . $incdir/test_functions.sh tests="BASE-UNLINK BASE-ATTR BASE-DELETE" -tests="$tests BASE-DIR2 BASE-TCON BASE-OPEN" +tests="$tests BASE-TCON BASE-OPEN" tests="$tests BASE-CHKPATH RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO" -tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE" +tests="$tests RAW-MKDIR RAW-SEEK RAW-OPEN RAW-WRITE" tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL RAW-RENAME" tests="$tests RAW-EAS RAW-STREAMS" diff --git a/source4/script/tests/test_rpc_quick.sh b/source4/script/tests/test_rpc_quick.sh index 4bcf3cfc4b..bf7e52c8f5 100755 --- a/source4/script/tests/test_rpc_quick.sh +++ b/source4/script/tests/test_rpc_quick.sh @@ -3,8 +3,8 @@ # add tests to this list as they start passing, so we test # that they stay passing ncacn_np_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-SCHANNEL RPC-NETLOGON RPC-UNIXINFO" -ncalrpc_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-SCHANNEL RPC-NETLOGON RPC-UNIXINFO" -ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO RPC-SCHANNEL RPC-NETLOGON RPC-UNIXINFO" +ncacn_ip_tcp_tests="RPC-ALTERCONTEXT RPC-JOIN RPC-ECHO" +ncalrpc_tests="RPC-ECHO" if [ $# -lt 4 ]; then cat <<EOF |