From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Tue, 3 Jun 2014 09:33:24 +0000 (+0200)
Subject: test: always write packet log
X-Git-Tag: 1.30-pre1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28876d6afaabc884e96ff8f008a35cb9360dce63;p=thirdparty%2Fchrony.git

test: always write packet log
---

diff --git a/test/simulation/111-knownclient b/test/simulation/111-knownclient
index 02304489..34f6227f 100755
--- a/test/simulation/111-knownclient
+++ b/test/simulation/111-knownclient
@@ -7,7 +7,6 @@ test_start "reply to client configured as server"
 server_conf="server 192.168.123.2
 acquisitionport 123"
 client_conf="acquisitionport 123"
-log_packets=1
 
 run_test || test_fail
 check_chronyd_exit || test_fail
diff --git a/test/simulation/112-port b/test/simulation/112-port
index 2401ccd2..605d4d30 100755
--- a/test/simulation/112-port
+++ b/test/simulation/112-port
@@ -4,8 +4,6 @@
 
 test_start "port and acquisitionport directives"
 
-log_packets=1
-
 run_test || test_fail
 check_chronyd_exit || test_fail
 check_source_selection || test_fail
diff --git a/test/simulation/test.common b/test/simulation/test.common
index dd7ec55b..8ed8c4b8 100644
--- a/test/simulation/test.common
+++ b/test/simulation/test.common
@@ -51,7 +51,6 @@ default_wander=1e-9
 default_refclock_jitter=""
 
 default_update_interval=0
-default_log_packets=0
 default_shift_pll=2
 
 default_server_strata=1
@@ -351,8 +350,7 @@ run_simulation() {
 	test_message 2 0 "running simulation:"
 
 	start_server $nodes \
-		-o tmp/log.offset -f tmp/log.freq \
-		$([ $log_packets -ne 0 ] && echo -p tmp/log.packets) \
+		-o tmp/log.offset -f tmp/log.freq -p tmp/log.packets \
 		-R $(awk "BEGIN {print $update_interval < 0 ? 2^-($update_interval) : 1}") \
 		-r $(awk "BEGIN {print $max_sync_time * 2^$update_interval}") \
 		-l $(awk "BEGIN {print $limit * 2^$update_interval}") && test_ok || test_error