[SCM] Samba Shared Repository - branch v3-6-test updated

Günther Deschner gd at samba.org
Wed Aug 25 17:12:00 MDT 2010


The branch, v3-6-test has been updated
       via  b9b0017... s3-selftest: fix make oldtest (testparm_s3 tests use $LOCAL_PATH).
       via  7de6425... s3-smbtorture: fix printf statement in ioctl test.
       via  fc89014... s3-build: always check for python.
       via  a6a22bb... s3-selftest: fix testparm tests as non-root.
       via  f265480... s3-selftest: add testparm tests to selftest.
      from  1cca2cd... s3-build: pointless to link in libads and dcutils into smbcacls.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit b9b00175cd3c0449c3a48e85667bd424c4a95136
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 16 16:40:12 2010 +0200

    s3-selftest: fix make oldtest (testparm_s3 tests use $LOCAL_PATH).
    
    Guenther
    (cherry picked from commit c80d4cb6fe6b02307599e0b9ad20031a3130f2f5)

commit 7de64254f54fafdd403322194e678b451759036b
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 16 13:30:00 2010 +0200

    s3-smbtorture: fix printf statement in ioctl test.
    
    Guenther
    (cherry picked from commit 731604d8aeccc4b49db1a7f88a5334788a8ed4ef)

commit fc89014ddd0ad4a5bac3448d8842176478a58eac
Author: Günther Deschner <gd at samba.org>
Date:   Mon Aug 16 12:08:33 2010 +0200

    s3-build: always check for python.
    
    This should fix make test. Metze, please check.
    
    Guenther
    (cherry picked from commit f24c99fba05ee24232f8047a11f09a093da7b266)

commit a6a22bbd144bceef90ed2f9cf0531a7328f79935
Author: Günther Deschner <gd at samba.org>
Date:   Fri Aug 13 18:28:48 2010 +0200

    s3-selftest: fix testparm tests as non-root.
    
    Thanks to Andreas for pointing this out.
    
    Guenther
    (cherry picked from commit 472d2a356fe2fad8b54920d99e2829344fd646cd)

commit f265480e67500dc63d6522b73447f5787c2a35ed
Author: Günther Deschner <gd at samba.org>
Date:   Thu Aug 12 15:43:03 2010 +0200

    s3-selftest: add testparm tests to selftest.
    
    Guenther
    (cherry picked from commit b0343b2c0b4851c7bfd3e2fdec171790f09536be)

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in                     |    7 ++++---
 source3/script/tests/selftest.sh         |    5 +++--
 source3/script/tests/test_testparm_s3.sh |    2 +-
 source3/selftest/tests.sh                |    4 ++++
 source3/torture/torture.c                |    2 +-
 5 files changed, 13 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index 73819b4..358cb6b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -210,6 +210,10 @@ AC_SAMBA_GNU_MAKE([true], [true])
 m4_include(../m4/check_perl.m4)
 AC_SAMBA_PERL([true], [merged_build_possible=no])
 
+# Check for python
+m4_include(../m4/check_python.m4)
+AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
+
 AC_CHECK_TOOL(AR, ar)
 
 dnl Check if we (actually our C compiler!) use GNU ld
@@ -6859,9 +6863,6 @@ fi
 m4_include(../lib/zlib/zlib.m4)
 
 if test x$enable_merged_build = xauto; then
-	# Check for python
-	m4_include(../m4/check_python.m4)
-	AC_SAMBA_PYTHON_DEVEL([true], [merged_build_possible=no])
 
 	AC_MSG_CHECKING([whether it would be possible to do a merged build])
 	AC_MSG_RESULT([$merged_build_possible])
diff --git a/source3/script/tests/selftest.sh b/source3/script/tests/selftest.sh
index cf7a9fe..6a74a89 100755
--- a/source3/script/tests/selftest.sh
+++ b/source3/script/tests/selftest.sh
@@ -105,7 +105,6 @@ NSS_WRAPPER_GROUP="$PRIVATEDIR/group"
 WINBINDD_SOCKET_DIR=$PREFIX_ABS/winbindd
 WINBINDD_PRIV_PIPE_DIR=$LOCKDIR/winbindd_privileged
 TEST_DIRECTORY=$DIRECTORY
-LOCAL_PATH=$SHRDIR
 
 export PREFIX PREFIX_ABS
 export CONFIGURATION CONFFILE SAMBA4CONFIGURATION SAMBA4CONFFILE
@@ -117,7 +116,6 @@ export WORKGROUP SERVER SERVER_IP
 export NSS_WRAPPER_PASSWD NSS_WRAPPER_GROUP
 export WINBINDD_SOCKET_DIR WINBINDD_PRIV_PIPE_DIR
 export TEST_DIRECTORY
-export LOCAL_PATH
 
 PATH=bin:$PATH
 export PATH
@@ -183,6 +181,9 @@ else
 fi
 chmod 777 $SHRDIR
 
+LOCAL_PATH=$SHRDIR
+export LOCAL_PATH
+
 ##
 ## Create driver share dirs
 ##
diff --git a/source3/script/tests/test_testparm_s3.sh b/source3/script/tests/test_testparm_s3.sh
index c88fc2d..b9e4b81 100755
--- a/source3/script/tests/test_testparm_s3.sh
+++ b/source3/script/tests/test_testparm_s3.sh
@@ -5,7 +5,7 @@
 # The main purpose (for now) is to test all the special handlers
 # and the macro expansions.
 
-TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
+TEMP_CONFFILE=${LOCAL_PATH}/smb.conf.tmp
 TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks"
 
 test x"$TEST_FUNCTIONS_SH" != x"INCLUDED" && {
diff --git a/source3/selftest/tests.sh b/source3/selftest/tests.sh
index c346426..7a9e68a 100755
--- a/source3/selftest/tests.sh
+++ b/source3/selftest/tests.sh
@@ -81,6 +81,9 @@ export USERNAME
 PASSWORD="\$PASSWORD"
 export PASSWORD
 
+LOCAL_PATH="\$LOCAL_PATH"
+export LOCAL_PATH
+
 (
 	shift $#
 	testitprefix="local_s3."
@@ -147,6 +150,7 @@ plantest "blackbox.smbclient_s3.crypt" dc BINDIR="$BINDIR" script/tests/test_smb
 #plantest "blackbox.smbclient_s3.crypt domain creds" member BINDIR="$BINDIR" script/tests/test_smbclient_s3.sh \$SERVER \$SERVER_IP \$DOMAIN\\\\\$DC_USERNAME \$DC_PASSWORD "-e"
 
 plantest "blackbox.net_s3" dc:local BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_net_s3.sh
+plantest "blackbox.testparm_s3" dc:local LOCAL_PATH="$LOCAL_PATH" BINDIR="$BINDIR" SCRIPTDIR="$SCRIPTDIR" SERVERCONFFILE="\$SMB_CONF_PATH" script/tests/test_testparm_s3.sh
 
 (
 	shift $#
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 28c6428..b78a811 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4904,7 +4904,7 @@ bool torture_ioctl_test(int dummy)
 	printf("ioctl job info: %s\n", nt_errstr(status));
 
 	for (device=0;device<0x100;device++) {
-		printf("testing device=0x%x\n", device);
+		printf("ioctl test with device = 0x%x\n", device);
 		for (function=0;function<0x100;function++) {
 			uint32 code = (device<<16) | function;
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list