[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0-86-gfbaab31

[Karolin Seeger]

The branch, v3-2-stable has been updated
       via  fbaab3104bbab088e16f7ef2789be4a0d2db1942 (commit)
       via  04df38243a9d4512e67c2859cc1087a29f5ed926 (commit)
       via  6f47c68da8bfdf74af9ca27e2787992dced6c651 (commit)
      from  d1034756a1456db4aa29e07ba444be5f39ad8c90 (commit)

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


- Log -----------------------------------------------------------------
commit fbaab3104bbab088e16f7ef2789be4a0d2db1942
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 21 11:23:55 2008 +0200

    testsuite: fix expr error on Tru64, triggered by uninitialized failed variable.
    
    Michael
    (cherry picked from commit 25cd227aaecf91dfa3114ae0fd2b47c783434aad)
    (cherry picked from commit 90f33570e45159193d9336c742bf53d51573849b)

commit 04df38243a9d4512e67c2859cc1087a29f5ed926
Author: Michael Adam <obnox at samba.org>
Date:   Mon Jul 21 11:17:36 2008 +0200

    testsuite: fix another expr syntax error. in tests_all.sh.
    
    Michael
    (cherry picked from commit 486b1bc5b5021565ec443fd463c8287c02c686b3)
    (cherry picked from commit 4038363b72eb852d462234a1ec85c3cc68765f0d)

commit 6f47c68da8bfdf74af9ca27e2787992dced6c651
Author: Michael Adam <obnox at samba.org>
Date:   Sun Jul 20 23:49:40 2008 +0200

    testsuite: fix expr syntax error in net registry test.
    
    Pointed out by Björn Jacke <bj at sernet.de>.
    
    Michael
    (cherry picked from commit 63e7d9adb7a51b3790eb431615cb6e450391a894)
    (cherry picked from commit 0dbb8def6b9647bb01f4544361cb87bafdfb3fc8)

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

Summary of changes:
 source/script/tests/test_net_registry.sh |    2 +-
 source/script/tests/tests_all.sh         |    4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/script/tests/test_net_registry.sh b/source/script/tests/test_net_registry.sh
index 0f29b25..5edcb06 100755
--- a/source/script/tests/test_net_registry.sh
+++ b/source/script/tests/test_net_registry.sh
@@ -362,7 +362,7 @@ take_administrative_rights()
 if test "x${RPC}" = "xrpc" ; then
 testit "giving user ${USERNAME} administrative rights" \
 	give_administrative_rights || \
-	failed=`expr $failed +1`
+	failed=`expr $failed + 1`
 fi
 
 testit "enumerate HKLM" \
diff --git a/source/script/tests/tests_all.sh b/source/script/tests/tests_all.sh
index e44ec8b..2b46da0 100755
--- a/source/script/tests/tests_all.sh
+++ b/source/script/tests/tests_all.sh
@@ -51,7 +51,7 @@ net_s3() {
 testparm_s3() {
 	echo "RUNNING TESTS testparm_s3"
 	$SCRIPTDIR/test_testparm_s3.sh \
-	|| failed=`expr $failed +$?`
+	|| failed=`expr $failed + $?`
 }
 
 posix_s3() {
@@ -73,6 +73,8 @@ posix_s3() {
 	fi
 }
 
+failed=0
+
 if test "x$TESTS" = "x" ; then
 	local_s3
 	smbtorture_s3


-- 
Samba Shared Repository