[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  26f01f3 s3: test_smbclient_s3: Correctly set and unset TZ variable for test.
      from  41cfc73 lib: Remove unused serverid.tdb

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


- Log -----------------------------------------------------------------
commit 26f01f37c95a5061f5dd8352943a3f8912634918
Author: Jeremy Allison <jra at samba.org>
Date:   Mon Dec 4 17:13:43 2017 -0800

    s3: test_smbclient_s3: Correctly set and unset TZ variable for test.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Andrew Bartlett <abartlet at samba.org>
    
    Autobuild-User(master): Andrew Bartlett <abartlet at samba.org>
    Autobuild-Date(master): Tue Dec  5 08:55:44 CET 2017 on sn-devel-144

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

Summary of changes:
 source3/script/tests/test_smbclient_s3.sh | 10 ++++++++++
 1 file changed, 10 insertions(+)


Changeset truncated at 500 lines:

diff --git a/source3/script/tests/test_smbclient_s3.sh b/source3/script/tests/test_smbclient_s3.sh
index d98da0d..84f6ef5 100755
--- a/source3/script/tests/test_smbclient_s3.sh
+++ b/source3/script/tests/test_smbclient_s3.sh
@@ -1419,6 +1419,10 @@ test_utimes()
 {
     tmpfile=$PREFIX/smbclient_interactive_prompt_commands
 
+    saved_TZ="$TZ"
+    TZ=UTC
+    export TZ
+
     cat > $tmpfile <<EOF
 del utimes_test
 put ${SMBCLIENT} utimes_test
@@ -1433,6 +1437,12 @@ EOF
     out=`eval $cmd`
     ret=$?
 
+    if [ -n "$SAVED_TZ" ] ; then
+	export TZ="$SAVED_TZ"
+    else
+	unset TZ
+    fi
+
     if [ $ret != 0 ] ; then
 	echo "$out"
 	echo "failed utimes test with output $ret"


-- 
Samba Shared Repository