test: always write packet log

diff --git a/test/simulation/111-knownclient b/test/simulation/111-knownclient
index 0230448925e328eb5678b409c5d2d54ef8146a94..34f6227fff361c262421a12c01c28f050b4ff681 100755 (executable)
--- 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 2401ccd2b67970d8a59210ba6431147f5f9296a1..605d4d3018cda507dec5ebfe187764f872f43978 100755 (executable)
--- 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 dd7ec55b359e1ab31a1fbc35da35fdb75d3a7ee3..8ed8c4b840f059844215df66b4caec0f42af5941 100644 (file)
--- 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