test: extend 113-leapsecond to test new leap modes

diff --git a/test/simulation/113-leapsecond b/test/simulation/113-leapsecond
index 3889d2e2cdcc1ef857a516c7d0000c4b7abe134e..0daf28b4c465b01a738eb58a5379b57dbdd17ce6 100755 (executable)
--- a/test/simulation/113-leapsecond
+++ b/test/simulation/113-leapsecond
@@ -5,17 +5,26 @@ test_start "leap second"
 
 export CLKNETSIM_START_DATE=$(TZ=UTC date -d 'Dec 30 2008 0:00:00' +'%s')
 
+leap=$[2 * 24 * 3600]
 limit=$[4 * 24 * 3600]
 server_conf="refclock SHM 0 dpoll 10 poll 10
 leapsectz right/UTC"
-server_step="(* 1.0 (equal 0.1 (sum 1.0) $[2 * 24 * 3600 + 1]))"
-client_step="(* 1.0 (equal 0.1 (sum 1.0) $[2 * 24 * 3600 + 1]))"
 refclock_jitter=1e-9
+refclock_offset="(* -1.0 (equal 0.1 (max (sum 1.0) $leap) $leap))"
 
-run_test || test_fail
-check_chronyd_exit || test_fail
-check_source_selection || test_fail
-check_packet_interval || test_fail
-check_sync || test_fail
+for leapmode in system step slew; do
+       client_conf="leapsecmode $leapmode"
+       if [ $leapmode = slew ]; then
+               max_sync_time=$[$leap + 12]
+       else
+               max_sync_time=$[$leap]
+       fi
+
+       run_test || test_fail
+       check_chronyd_exit || test_fail
+       check_source_selection || test_fail
+       check_packet_interval || test_fail
+       check_sync || test_fail
+done
 
 test_pass

diff --git a/test/simulation/test.common b/test/simulation/test.common
index 57095943fdfcc4640c6157763e71ac600df304e7..9dade00250b2c87bdab98817eea1e45a5aaeac70 100644 (file)
--- a/test/simulation/test.common
+++ b/test/simulation/test.common
@@ -49,6 +49,7 @@ default_base_delay=1e-4
 default_jitter=1e-4
 default_wander=1e-9
 default_refclock_jitter=""
+default_refclock_offset=0.0
 
 default_update_interval=0
 default_shift_pll=2
@@ -168,7 +169,7 @@ get_delay_expr() {
 }
 
 get_refclock_expr() {
-       echo "(* $refclock_jitter (normal))"
+       echo "(+ $refclock_offset (* $refclock_jitter (normal)))"
 }
 
 get_chronyd_nodes() {