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.

diff --git a/test/simulation/103-initstepslew b/test/simulation/103-initstepslew
index 89611f7342aae63953165cd016f0b3a0fa244c6b..0d0352b3f761eaaeb34bf19c3e3326425b76f9f6 100755 (executable)
--- 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 2d3887d35791ed09e5f37f3b2557c51e9b826b10..0230448925e328eb5678b409c5d2d54ef8146a94 100755 (executable)
--- 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 a6cde3c11e07dbf900c1c7aee3b8df52513d38c5..1a431384d022901650d05773f7d3feba8f653b34 100644 (file)
--- 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