X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftimer%2Ftest%2Frun.c;fp=ccan%2Ftimer%2Ftest%2Frun.c;h=51648fb1c7978a5ba51aeb33d03c6b5ea0fb4d74;hb=a9d42b8d3bf2b37f47caa428e869fceb4bb33082;hp=f7b711f2c8530cb98183baf10ed07770f3fc4264;hpb=fe6bc8c530795a6c718f7e8fd1a6643d9f3024a1;p=ccan

diff --git a/ccan/timer/test/run.c b/ccan/timer/test/run.c
index f7b711f2..51648fb1 100644
--- a/ccan/timer/test/run.c
+++ b/ccan/timer/test/run.c
@@ -24,6 +24,10 @@ int main(void)
 	ok1(timers_check(&timers, NULL));
 	ok1(!timer_earliest(&timers, &earliest));
 
+	timer_init(&t[0]);
+	/* timer_del can be called immediately after init. */
+	timer_del(&timers, &t[0]);
+
 	timer_add(&timers, &t[0], timeabs_from_nsec(1));
 	ok1(timers_check(&timers, NULL));
 	ok1(timer_earliest(&timers, &earliest));
@@ -32,10 +36,15 @@ int main(void)
 	ok1(timers_check(&timers, NULL));
 	ok1(!timer_earliest(&timers, &earliest));
 
+	/* timer_del can be called twice, no problems. */
+	timer_del(&timers, &t[0]);
+
 	/* Check timer ordering. */
 	for (i = 0; i < 32; i++) {
+		timer_init(&t[i*2]);
 		timer_add(&timers, &t[i*2], timeabs_from_nsec(1ULL << i));
 		ok1(timers_check(&timers, NULL));
+		timer_init(&t[i*2+1]);
 		timer_add(&timers, &t[i*2+1], timeabs_from_nsec((1ULL << i) + 1));
 		ok1(timers_check(&timers, NULL));
 	}