rpms
/
systemd
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Skip dhcp[6]-client tests" 

This reverts commit 94a4908748.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-03-25 14:40:56 +01:00
parent 21fe449c94
commit 484de996fc
2 changed files with 0 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-Skip-dhcp-6-client-tests.patch
View File

@ -1,46 +0,0 @@
From 9ebdde4ac22bd0e33ffbb606a27fa79acb7fc7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 15 Mar 2019 00:04:17 +0100
Subject: [PATCH] Skip dhcp[6]-client tests
---
src/libsystemd-network/test-dhcp-client.c | 1 -
src/libsystemd-network/test-dhcp6-client.c | 6 ++++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c
index fe6788d91b..9645d87c6c 100644
--- a/src/libsystemd-network/test-dhcp-client.c
+++ b/src/libsystemd-network/test-dhcp-client.c
@@ -566,7 +566,6 @@ int main(int argc, char *argv[]) {
test_dhcp_identifier_set_iaid();
test_discover_message(e);
- test_addr_acq(e);
#if VALGRIND
/* Make sure the async_close thread has finished.
diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c
index fa94b3cb75..2681cdf03f 100644
--- a/src/libsystemd-network/test-dhcp6-client.c
+++ b/src/libsystemd-network/test-dhcp6-client.c
@@ -889,7 +889,7 @@ static int test_client_solicit(sd_event *e) {
sd_dhcp6_client *client;
usec_t time_now = now(clock_boottime_or_monotonic());
struct in6_addr address = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01 } } };
- int val;
+ int val, r;
log_debug("/* %s */", __func__);
@@ -919,7 +919,9 @@ static int test_client_solicit(sd_event *e) {
assert_se(sd_dhcp6_client_set_local_address(client, &address) >= 0);
- assert_se(sd_dhcp6_client_start(client) >= 0);
+ r = sd_dhcp6_client_start(client);
+ if (r < 0)
+ return log_warning_errno(r, "Failed to start dhcp6 client: %m");
sd_event_loop(e);

1
systemd.spec
View File

@ -52,7 +52,6 @@ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done|
GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[67]* hwdb/parse_hwdb.py > hwdb.patch
%endif
Patch0001: 0001-Skip-dhcp-6-client-tests.patch
Patch0002: 0002-Revert-units-set-NoNewPrivileges-for-all-long-runnin.patch
Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch