git.samba.org
/
amitay
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e01d7d9
)
s3:tests: Skip smbd error test if we do not log to stdout
author
Andreas Schneider
<asn@samba.org>
Thu, 1 Mar 2018 09:26:56 +0000
(10:26 +0100)
committer
Andreas Schneider
<asn@cryptomilk.org>
Fri, 2 Mar 2018 23:01:23 +0000
(
00:01
+0100)
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
source3/script/tests/test_smbd_error.sh
patch
|
blob
|
history
diff --git
a/source3/script/tests/test_smbd_error.sh
b/source3/script/tests/test_smbd_error.sh
index e9af47aea5168b05322324e188ec47be4884f81d..e93dff2d6a7fbc3a1224b2b61cd55c9884aaba98 100755
(executable)
--- a/
source3/script/tests/test_smbd_error.sh
+++ b/
source3/script/tests/test_smbd_error.sh
@@
-9,6
+9,16
@@
. $(dirname $0)/../../../testprogs/blackbox/subunit.sh
failed=0
+
+if [ $SMBD_DONT_LOG_STDOUT -eq 1 ]; then
+ subunit_start_test "check_panic_0"
+ subunit_skip_test "check_panic_0" <<EOF
+logging to stdout disabled
+EOF
+
+ testok $0 $failed
+fi
+
error_inject_conf=$(dirname $SMB_CONF_PATH)/error_inject.conf
panic_count_0=$(grep -c PANIC $SMBD_TEST_LOG)