[SCM] Samba Shared Repository - branch master updated

[Björn Jacke]

The branch, master has been updated
       via  d1aeb2d s3:test_net_registry_check: eliminate "local" keyword in shell
       via  b2ba94b s3:Makefile: use our "$MAKE" instead of "make" in our own Makefile
      from  5c31e5d s3:selftest: run SMB2-SESSION-RECONNECT

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit d1aeb2d1c3bfb87e9ab4079535867b40fb722fde
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Jun 25 20:28:22 2012 +0200

    s3:test_net_registry_check: eliminate "local" keyword in shell
    
    prefer to use function syntax with (...)  to make variables local
    
    Autobuild-User(master): Björn Jacke <bj at sernet.de>
    Autobuild-Date(master): Tue Jun 26 00:32:11 CEST 2012 on sn-devel-104

commit b2ba94b146923573f4203d17474777bb4c30cea8
Author: Björn Jacke <bj at sernet.de>
Date:   Mon Jun 25 19:44:24 2012 +0200

    s3:Makefile: use our "$MAKE" instead of "make" in our own Makefile

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

Summary of changes:
 source3/Makefile.in                             |    4 +-
 source3/script/tests/test_net_registry_check.sh |   30 +++++++++++-----------
 2 files changed, 17 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 4adbaa0..148de92 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3418,6 +3418,6 @@ vfs_examples:
 	( \
 	cd ../examples/VFS && \
 	./configure && \
-	make clean && \
-	make \
+	$(MAKE) clean && \
+	$(MAKE) \
 	)
diff --git a/source3/script/tests/test_net_registry_check.sh b/source3/script/tests/test_net_registry_check.sh
index 627f67c..ca8da76 100755
--- a/source3/script/tests/test_net_registry_check.sh
+++ b/source3/script/tests/test_net_registry_check.sh
@@ -69,8 +69,8 @@ regchecknrepair()
 }
 
 test_simple()
-{
-	local ERRSTR=""
+(
+	ERRSTR=""
 	cp $REGORIG $REG
 
 	regcheck
@@ -78,7 +78,7 @@ test_simple()
 		echo $ERRSTR
 		return 1
 	}
-}
+)
 
 test_damage()
 {
@@ -86,36 +86,36 @@ test_damage()
 }
 
 test_duplicate()
-{
-	local ERRSTR=""
+(
+	ERRSTR=""
 	$DBWRAP_TOOL $REG store 'HKLM/SOFTWARE' hex '02000000534F4654574152450053595354454D00'
 
 	regchecknrepair "Duplicate subkeylist" 1
-}
+)
 
 test_slashes()
-{
-	local ERRSTR=""
+(
+	ERRSTR=""
 	$DBWRAP_TOOL $REG store 'HKLM/SOFTWARE' hex '02000000534F4654574152450053595354454D00'
 
 	regchecknrepair "Unnormal key:" 1
-}
+)
 
 test_uppercase()
-{
-	local ERRSTR=""
+(
+	ERRSTR=""
 	$DBWRAP_TOOL $REG store 'HKLM\Software' hex '02000000534F4654574152450053595354454D00'
 
 	regchecknrepair "Unnormal key:" 1
-}
+)
 
 test_strangeletters()
-{
-	local ERRSTR=""
+(
+	ERRSTR=""
 	$DBWRAP_TOOL $REG store 'HKLM\SOFTWARE' hex '02000000534F4654574FABFABFABFAB354454D00'
 
 	regchecknrepair "Conversion error: Incomplete multibyte sequence" 1
-}
+)
 
 testit "simple" \
 	test_simple || \


-- 
Samba Shared Repository