summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-10-09 06:48:55 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:15:20 -0500
commit6c6842ee9449c45160fb82b6c1002f20414d3e6e (patch)
tree9b34875d836dfa7a956543a861fc0c8dae8529ac
parent354ddf6c57f555f9c98c89a728a77ced8c30ce3d (diff)
downloadsamba-6c6842ee9449c45160fb82b6c1002f20414d3e6e.tar.gz
samba-6c6842ee9449c45160fb82b6c1002f20414d3e6e.tar.bz2
samba-6c6842ee9449c45160fb82b6c1002f20414d3e6e.zip
r19181: merge from samba4:
with "export MAKE_TEST_KEEP_PCAP=yes" make test doesn't delete the generated pcap files metze (This used to be commit 74212c30563826e2248c1cb16e4c953a28a25488)
-rw-r--r--source3/script/tests/test_functions.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/script/tests/test_functions.sh b/source3/script/tests/test_functions.sh
index cbec86e70c..3917eb86ac 100644
--- a/source3/script/tests/test_functions.sh
+++ b/source3/script/tests/test_functions.sh
@@ -228,7 +228,12 @@ testit() {
fi
return 1;
fi
- rm -f $TEST_LOG $TEST_PCAP;
+ rm -f $TEST_LOG;
+ if [ x"$MAKE_TEST_KEEP_PCAP" = x"yes" ];then
+ echo "TEST PCAP: $TEST_PCAP"
+ else
+ rm -f $TEST_PCAP;
+ fi
if [ x"$RUN_FROM_BUILD_FARM" = x"yes" ];then
echo "ALL OK: $cmdline"
echo "=========================================="