git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
57a290e
)
s3:selftest: fix warnings with empty *_TEST_LOG variables
author
Stefan Metzmacher
<metze@samba.org>
Wed, 28 Jan 2009 11:03:59 +0000
(12:03 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Wed, 28 Jan 2009 11:06:23 +0000
(12:06 +0100)
metze
source3/script/tests/test_functions.sh
patch
|
blob
|
history
diff --git
a/source3/script/tests/test_functions.sh
b/source3/script/tests/test_functions.sh
index 407d46aa9e29a4a774ff5019dc397ef9ec00ce26..79642e045b71394669cc72a689f9f3055d6fd57c 100644
(file)
--- a/
source3/script/tests/test_functions.sh
+++ b/
source3/script/tests/test_functions.sh
@@
-197,13
+197,13
@@
testit() {
TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap"
trap "rm -f $TEST_LOG $TEST_PCAP" EXIT
TEST_PCAP="$PREFIX/test_${shname}_${UNIQUE_PID}.pcap"
trap "rm -f $TEST_LOG $TEST_PCAP" EXIT
- if [ -z "$nmbd_log_size" ]; then
+
samba3_nmbd_test_log &&
if [ -z "$nmbd_log_size" ]; then
nmbd_log_size=`wc -l < $NMBD_TEST_LOG`;
fi
nmbd_log_size=`wc -l < $NMBD_TEST_LOG`;
fi
- if [ -z "$winbindd_log_size" ]; then
+
samba3_winbindd_test_log &&
if [ -z "$winbindd_log_size" ]; then
winbindd_log_size=`wc -l < $WINBINDD_TEST_LOG`;
fi
winbindd_log_size=`wc -l < $WINBINDD_TEST_LOG`;
fi
- if [ -z "$smbd_log_size" ]; then
+
samba3_smbd_test_log &&
if [ -z "$smbd_log_size" ]; then
smbd_log_size=`wc -l < $SMBD_TEST_LOG`;
fi
smbd_log_size=`wc -l < $SMBD_TEST_LOG`;
fi