From: Zbigniew Jędrzejewski-Szmek Date: Tue, 4 Aug 2020 14:07:03 +0000 (+0200) Subject: Merge pull request #16596 from poettering/event-time-rel X-Git-Tag: v247-rc1~456 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d06bd2e78535de895c540b98d5d5907b85d32a09;p=thirdparty%2Fsystemd.git Merge pull request #16596 from poettering/event-time-rel Conflict in src/libsystemd-network/test-ndisc-rs.c fixed manually. --- d06bd2e78535de895c540b98d5d5907b85d32a09 diff --cc src/libsystemd-network/test-ndisc-rs.c index 3f46c8d0c58,db617f93fc9..2c4ffb94dd8 --- a/src/libsystemd-network/test-ndisc-rs.c +++ b/src/libsystemd-network/test-ndisc-rs.c @@@ -290,9 -289,10 +289,10 @@@ static void test_rs(void) assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); assert_se(sd_ndisc_set_callback(nd, test_callback, e) >= 0); - assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), - time_now + 30 * USEC_PER_SEC, 0, - test_rs_hangcheck, NULL) >= 0); + assert_se(sd_event_add_time_relative( + e, &test_hangcheck, clock_boottime_or_monotonic(), - 2 *USEC_PER_SEC, 0, ++ 30 * USEC_PER_SEC, 0, + test_rs_hangcheck, NULL) >= 0); assert_se(sd_ndisc_stop(nd) >= 0); assert_se(sd_ndisc_start(nd) >= 0); @@@ -392,9 -391,10 +391,10 @@@ static void test_timeout(void) assert_se(sd_ndisc_set_ifindex(nd, 42) >= 0); assert_se(sd_ndisc_set_mac(nd, &mac_addr) >= 0); - assert_se(sd_event_add_time(e, &test_hangcheck, clock_boottime_or_monotonic(), - time_now + 30 * USEC_PER_SEC, 0, - test_rs_hangcheck, NULL) >= 0); + assert_se(sd_event_add_time_relative( + e, &test_hangcheck, clock_boottime_or_monotonic(), - 2U * USEC_PER_SEC, 0, ++ 30 * USEC_PER_SEC, 0, + test_rs_hangcheck, NULL) >= 0); assert_se(sd_ndisc_start(nd) >= 0);