The branch, master has been updated
       via  f3b650f Fix autobuild for user names starting with c
      from  f59f6ce nsswitch: fix wbinfo -m --verbose trust type "Local"

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


- Log -----------------------------------------------------------------
commit f3b650fc75b8edb27a852b88f469e8cd4a317f99
Author: Christof Schmitt <c...@samba.org>
Date:   Mon Feb 26 23:58:20 2018 +0100

    Fix autobuild for user names starting with c
    
    This is similar to the fix from commit 0b1ba00: Now commit 475a7616 
introduced
    tests that create user names in the form DOMAIN\USER and pass them through
    shell functions. There "echo" is used to print he username, resulting in
    /bin/dash on sn-devel to interpret e.g. \c which skips any further output. 
The
    result are test exceptions like:
    
    failure: samba4.blackbox.trust_ntlm.Test01 rpcclient lookupnames with 
LOCALADMEMBER\cs(ad_member:local) [
    Exception: Exception: LOCALADMEMBER
    
    ]
    time: 2018-02-26 23:00:46.688800Z
    
    Fix this by replacing the echo with printf %s. This surfaced for
    test_rpcclient_grep, but apply the same change to all functions in
    common_test_fns.inc for consistency.
    
    Signed-off-by: Christof Schmitt <c...@samba.org>
    Reviewed-by: Andrew Bartlett <abart...@samba.org>
    
    Autobuild-User(master): Christof Schmitt <c...@samba.org>
    Autobuild-Date(master): Fri Mar  2 10:49:09 CET 2018 on sn-devel-144

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

Summary of changes:
 testprogs/blackbox/common_test_fns.inc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/testprogs/blackbox/common_test_fns.inc 
b/testprogs/blackbox/common_test_fns.inc
index 77c635b..8d755a4 100755
--- a/testprogs/blackbox/common_test_fns.inc
+++ b/testprogs/blackbox/common_test_fns.inc
@@ -14,7 +14,7 @@ test_smbclient() {
        if [ x$status = x0 ]; then
                subunit_pass_test "$name"
        else
-               echo "$output" | subunit_fail_test "$name"
+               printf '%s' "$output" | subunit_fail_test "$name"
        fi
        return $status
 }
@@ -30,7 +30,7 @@ test_smbclient_expect_failure() {
        output=`$VALGRIND $smbclient $CONFIGURATION "$unc" -c "$cmd" $@ 2>&1`
        status=$?
        if [ x$status = x0 ]; then
-               echo "$output" | subunit_fail_test "$name"
+               printf '%s' "$output" | subunit_fail_test "$name"
        else
                subunit_pass_test "$name"
        fi
@@ -50,15 +50,15 @@ test_rpcclient_grep() {
        output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1`
        status=$?
        if [ x$status != x0 ]; then
-               echo "$output" | subunit_fail_test "$name"
+               printf '%s' "$output" | subunit_fail_test "$name"
                return $status
        fi
-       echo "$output" | grep -q "$grep"
+       printf '%s' "$output" | grep -q "$grep"
        gstatus=$?
        if [ x$gstatus = x0 ]; then
                subunit_pass_test "$name"
        else
-               echo "$output" | subunit_fail_test "$name"
+               printf '%s' "$output" | subunit_fail_test "$name"
        fi
        return $status
 }
@@ -76,15 +76,15 @@ test_rpcclient_expect_failure_grep() {
        output=`$VALGRIND $rpcclient $CONFIGURATION "$srv" -c "$cmd" $@ 2>&1`
        status=$?
        if [ x$status = x0 ]; then
-               echo "$output" | subunit_fail_test "$name"
+               printf '%s' "$output" | subunit_fail_test "$name"
                return $status
        fi
-       echo "$output" | grep -q "$grep"
+       printf '%s' "$output" | grep -q "$grep"
        gstatus=$?
        if [ x$gstatus = x0 ]; then
                subunit_pass_test "$name"
        else
-               echo "$output" | subunit_fail_test "$name"
+               printf '%s' "$output" | subunit_fail_test "$name"
        fi
        return $status
 }


-- 
Samba Shared Repository

Reply via email to