s3:tests: use SAMBA_DEPRECATED_SUPPRESS=1 for backbox tests

These tests should not depend on the number of deprecation warnings

Signed-off-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/script/tests/test_aio_outstanding.sh b/source3/script/tests/test_aio_outstanding.sh
index f4265277a1a407f3ddec118371624d8391c8422e..4f68d3bb62023215c062dd59a99c62f708c86139 100755 (executable)
--- a/source3/script/tests/test_aio_outstanding.sh
+++ b/source3/script/tests/test_aio_outstanding.sh
@@ -18,6 +18,10 @@ SMBCLIENT=$2
 SERVER=$3
 SHARE=$4
 
+# Do not let deprecated option warnings muck this up
+SAMBA_DEPRECATED_SUPPRESS=1
+export SAMBA_DEPRECATED_SUPPRESS
+
 incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
@@ -50,7 +54,6 @@ exec 100>smbclient-stdin  101<smbclient-stdout 102<smbclient-stderr
 
 # consume the smbclient startup messages
 head -n 1 <&101
-head -n 1 <&102
 
 # Ensure we're putting a fresh file.
 echo "del aio_outstanding_testfile" >&100

diff --git a/source3/script/tests/test_force_close_share.sh b/source3/script/tests/test_force_close_share.sh
index 46db07edfbebed4f5013c33f42c0614451beb51c..2d01b3162f119c025f2f226f0a88d6269dfd310b 100755 (executable)
--- a/source3/script/tests/test_force_close_share.sh
+++ b/source3/script/tests/test_force_close_share.sh
@@ -22,6 +22,10 @@ SHARE=$5
 PREFIX=$6
 shift 6
 
+# Do not let deprecated option warnings muck this up
+SAMBA_DEPRECATED_SUPPRESS=1
+export SAMBA_DEPRECATED_SUPPRESS
+
 incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 . $incdir/common_test_fns.inc
@@ -71,7 +75,6 @@ exec 100>$FIFO_STDIN  101<$FIFO_STDOUT 102<$FIFO_STDERR
 
 # consume the smbclient startup messages
 head -n 1 <&101
-head -n 1 <&102
 
 # Ensure we're putting a fresh file.
 echo "lcd $(dirname $TESTFILE)" >&100

diff --git a/source3/script/tests/test_netfileenum.sh b/source3/script/tests/test_netfileenum.sh
index e8c464307b80c194867ed449c487aae8dc49205d..ab0eb925dbb5ccfff4b62d886c749875431cd5ff 100755 (executable)
--- a/source3/script/tests/test_netfileenum.sh
+++ b/source3/script/tests/test_netfileenum.sh
@@ -16,6 +16,10 @@ NET="$1"; shift 1
 SERVER="$1"; shift 1
 SHARE="$1"; shift 1
 
+# Do not let deprecated option warnings muck this up
+SAMBA_DEPRECATED_SUPPRESS=1
+export SAMBA_DEPRECATED_SUPPRESS
+
 incdir=$(dirname $0)/../../../testprogs/blackbox
 . $incdir/subunit.sh
 
@@ -38,7 +42,6 @@ exec 100>smbclient-stdin 101<smbclient-stdout 102<smbclient-stderr
 
 # consume the smbclient startup messages
 head -n 1 <&101
-head -n 1 <&102
 
 FILE=x64
 

diff --git a/source3/script/tests/test_open_eintr.sh b/source3/script/tests/test_open_eintr.sh
index 3eabb2a4bc765549465dddaeb21b5db91ca3b34b..c7dec2c77daa7c157feb2154b6d8a963576ce0b6 100755 (executable)
--- a/source3/script/tests/test_open_eintr.sh
+++ b/source3/script/tests/test_open_eintr.sh
@@ -16,6 +16,10 @@ SMBCONTROL=$1; shift 1
 SERVER=$1; shift 1
 SHARE=$1; shift 1
 
+# Do not let deprecated option warnings muck this up
+SAMBA_DEPRECATED_SUPPRESS=1
+export SAMBA_DEPRECATED_SUPPRESS
+
 error_inject_conf=$(dirname ${SERVERCONFFILE})/error_inject.conf
 > ${error_inject_conf}
 
@@ -41,7 +45,6 @@ exec 100>smbclient-stdin 101<smbclient-stdout 102<smbclient-stderr
 
 # consume the smbclient startup messages
 head -n 1 <&101
-head -n 1 <&102
 
 echo "error_inject:openat = EINTR" > ${error_inject_conf}
 ${SMBCONTROL} ${CONF} 0 reload-config