diff options
| -rw-r--r-- | source3/modules/vfs_default.c | 3 | ||||
| -rwxr-xr-x | source3/script/tests/selftest.sh | 4 | ||||
| -rw-r--r-- | source3/script/tests/test_functions.sh | 4 | ||||
| -rwxr-xr-x | source3/script/tests/test_posix_s3.sh | 9 | ||||
| -rwxr-xr-x | source3/script/tests/tests_all.sh | 6 |
5 files changed, 9 insertions, 17 deletions
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c index d1772eaf080..4febc064d94 100644 --- a/source3/modules/vfs_default.c +++ b/source3/modules/vfs_default.c @@ -905,7 +905,8 @@ static NTSTATUS vfswrap_notify_watch(vfs_handle_struct *vfs_handle, static int vfswrap_chflags(vfs_handle_struct *handle, const char *path, int flags) { - return chflags(path, flags); + errno = ENOSYS; + return -1; } static size_t vfswrap_fget_nt_acl(vfs_handle_struct *handle, files_struct *fsp, int fd, uint32 security_info, SEC_DESC **ppdesc) diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh index ba194dfa111..d5cd2fbedac 100755 --- a/source3/script/tests/selftest.sh +++ b/source3/script/tests/selftest.sh @@ -1,6 +1,5 @@ #!/bin/sh -set -x if [ $# != 3 ]; then echo "$0 <directory> <all | quick> <smbtorture4>" exit 1 @@ -94,6 +93,7 @@ cat >$COMMONCONFFILE<<EOF pid directory = $PIDDIR lock directory = $LOCKDIR log file = $LOGDIR/log.%m + log level = 0 name resolve order = bcast EOF @@ -120,7 +120,6 @@ EOF cat >$SERVERCONFFILE<<EOF [global] - log level = 10 netbios name = $SERVER interfaces = $SERVER_IP/8 bind interfaces only = yes @@ -147,7 +146,6 @@ cat >$SERVERCONFFILE<<EOF map hidden = yes map system = yes create mask = 755 - guest ok = yes [hideunread] copy = tmp hide unreadable = yes diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh index 0089f620a3f..1cc9ea12643 100644 --- a/source3/script/tests/test_functions.sh +++ b/source3/script/tests/test_functions.sh @@ -45,7 +45,7 @@ samba3_check_or_start() { fi MAKE_TEST_BINARY=$BINDIR/nmbd export MAKE_TEST_BINARY - timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & + timelimit $NMBD_MAXTIME $NMBD_VALGRIND $BINDIR/nmbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $NMBD_TEST_LOG 2>&1 & TIMELIMIT_NMBD_PID=$! MAKE_TEST_BINARY= echo $TIMELIMIT_NMBD_PID > $PIDDIR/timelimit.nmbd.pid @@ -77,7 +77,7 @@ samba3_check_or_start() { fi MAKE_TEST_BINARY=$BINDIR/smbd export MAKE_TEST_BINARY - timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F --no-process-group -s $SERVERCONFFILE -l $SOCKET_WRAPPER_DIR > $SMBD_TEST_LOG 2>&1 & + timelimit $SMBD_MAXTIME $SMBD_VALGRIND $BINDIR/smbd -F -S --no-process-group -d0 -s $SERVERCONFFILE > $SMBD_TEST_LOG 2>&1 & TIMELIMIT_SMBD_PID=$! MAKE_TEST_BINARY= echo $TIMELIMIT_SMBD_PID > $PIDDIR/timelimit.smbd.pid diff --git a/source3/script/tests/test_posix_s3.sh b/source3/script/tests/test_posix_s3.sh index 4d41786e6ef..a56032c7f45 100755 --- a/source3/script/tests/test_posix_s3.sh +++ b/source3/script/tests/test_posix_s3.sh @@ -36,18 +36,11 @@ raw="$raw RAW-SAMBA3HIDE RAW-SAMBA3BADPATH" rpc="RPC-AUTHCONTEXT RPC-BINDSAMBA3 RPC-SAMBA3-SRVSVC RPC-SAMBA3-SHARESEC" rpc="$rpc RPC-UNIXINFO RPC-SAMBA3-SPOOLSS RPC-SAMBA3-WKSSVC" -base= -raw= -rpc= -unix="UNIX-WHOAMI UNIX-INFO2" - -RUN_FROM_BUILD_FARM=no - if test x$RUN_FROM_BUILD_FARM = xyes; then rpc="$rpc RPC-NETLOGSAMBA3 RPC-SAMBA3SESSIONKEY RPC-SAMBA3-GETUSERNAME" fi -tests="$base $raw $rpc $unix" +tests="$base $raw $rpc" skipped="BASE-CHARSET BASE-DEFER_OPEN BASE-DELAYWRITE BASE-OPENATTR BASE-TCONDEV" skipped="$skipped RAW-ACLS RAW-COMPOSITE RAW-CONTEXT RAW-EAS" diff --git a/source3/script/tests/tests_all.sh b/source3/script/tests/tests_all.sh index 2287f829781..dd593899e4b 100755 --- a/source3/script/tests/tests_all.sh +++ b/source3/script/tests/tests_all.sh @@ -1,7 +1,7 @@ -#$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?` -#$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` -#$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` +$SCRIPTDIR/test_local_s3.sh || failed=`expr $failed + $?` +$SCRIPTDIR/test_smbtorture_s3.sh //$SERVER_IP/tmp $USERNAME $PASSWORD "" || failed=`expr $failed + $?` +$SCRIPTDIR/test_smbclient_s3.sh $SERVER $SERVER_IP || failed=`expr $failed + $?` SMBTORTURE4VERSION=`$SMBTORTURE4 --version` if [ -n "$SMBTORTURE4" -a -n "$SMBTORTURE4VERSION" ];then |