Merge Makefile rewrite into master

[ccan] / ccan / timer / test / run-expiry.c

diff --git a/ccan/timer/test/run-expiry.c b/ccan/timer/test/run-expiry.c
index e53de6a95311ed78c5374261c0a5afade4e12f7b..39b5b5eafd5b00d06cc81bca395b46853fa64cd0 100644 (file)
--- a/ccan/timer/test/run-expiry.c
+++ b/ccan/timer/test/run-expiry.c
@@ -7,22 +7,20 @@ int main(void)
 {
        struct timers timers;
        struct timer t;
-       struct list_head list;
 
        /* This is how many tests you plan to run */
        plan_tests(7);
 
        timers_init(&timers, grains_to_time(1364984760903400ULL));
        ok1(timers.base == 1364984760903400ULL);
-       timer_add(&timers, &t, grains_to_time(1364984761003398ULL));
+       timer_init(&t);
+       timer_addmono(&timers, &t, grains_to_time(1364984761003398ULL));
        ok1(t.time == 1364984761003398ULL);
        ok1(timers.first == 1364984761003398ULL);
-       timers_expire(&timers, grains_to_time(1364984760903444ULL), &list);
+       ok1(!timers_expire(&timers, grains_to_time(1364984760903444ULL)));
        ok1(timers_check(&timers, NULL));
-       ok1(list_pop(&list, struct timer, list) == NULL);
-       timers_expire(&timers, grains_to_time(1364984761002667ULL), &list);
+       ok1(!timers_expire(&timers, grains_to_time(1364984761002667ULL)));
        ok1(timers_check(&timers, NULL));
-       ok1(list_pop(&list, struct timer, list) == NULL);
 
        timers_cleanup(&timers);