From 727bf195d109fc283d73834b97ae3238120472df Mon Sep 17 00:00:00 2001 From: Miroslav Lichvar Date: Tue, 25 Mar 2014 17:33:55 +0100 Subject: [PATCH] test: update for latest clknetsim Latest clknetsim now allows source and destination port numbers to differ. This fixes the tests to work with the recent changes that added client NTP sockets. --- test/simulation/103-initstepslew | 5 +---- test/simulation/111-knownclient | 4 +++- test/simulation/test.common | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/simulation/103-initstepslew b/test/simulation/103-initstepslew index 89611f7..0d0352b 100755 --- a/test/simulation/103-initstepslew +++ b/test/simulation/103-initstepslew @@ -7,10 +7,7 @@ freq_offset=0.0 wander=0.0 limit=100 -# clknetsim requires source port (if bound) to match dest port -client_server_options="port 124" -client_conf="initstepslew 5 192.168.123.1 -port 124" +client_conf="initstepslew 5 192.168.123.1" min_sync_time=15 max_sync_time=30 diff --git a/test/simulation/111-knownclient b/test/simulation/111-knownclient index 2d3887d..0230448 100755 --- a/test/simulation/111-knownclient +++ b/test/simulation/111-knownclient @@ -4,7 +4,9 @@ test_start "reply to client configured as server" -server_conf="server 192.168.123.2" +server_conf="server 192.168.123.2 +acquisitionport 123" +client_conf="acquisitionport 123" log_packets=1 run_test || test_fail diff --git a/test/simulation/test.common b/test/simulation/test.common index a6cde3c..1a43138 100644 --- a/test/simulation/test.common +++ b/test/simulation/test.common @@ -18,7 +18,7 @@ export PATH=../../:$PATH export CLKNETSIM_PATH=clknetsim # Known working clknetsim revision -clknetsim_revision=eb0b85335c40027ac941b2276142542fff482107 +clknetsim_revision=c25faaf0a08e33e281bf33b209f4e295624b28b2 clknetsim_url=https://github.com/mlichvar/clknetsim/archive/$clknetsim_revision.tar.gz # Only Linux is supported