diff options
| author | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2017-01-17 20:25:47 +0100 |
| commit | bed53db3e064450b56e23ec654f40a3bafe58815 (patch) | |
| tree | 314508d6c904b1224dab2070e0cfdd5a02d7dd89 /src/devices/tests/test-arping.c | |
| parent | 7135a6e87c938139e3a5db121d62dcaa783345d1 (diff) | |
| parent | 58f8be580039b0575b197b9573a1c92745d96d30 (diff) | |
Merge tag 'upstream/1.5.90' into experimental
Upstream version 1.5.90
Diffstat (limited to 'src/devices/tests/test-arping.c')
| -rw-r--r-- | src/devices/tests/test-arping.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/devices/tests/test-arping.c b/src/devices/tests/test-arping.c index 244d0715..59223f11 100644 --- a/src/devices/tests/test-arping.c +++ b/src/devices/tests/test-arping.c @@ -20,8 +20,8 @@ #include "nm-default.h" -#include "nm-arping-manager.h" -#include "test-common.h" +#include "devices/nm-arping-manager.h" +#include "platform/tests/test-common.h" #define IFACE_VETH0 "nm-test-veth0" #define IFACE_VETH1 "nm-test-veth1" @@ -125,6 +125,8 @@ fixture_teardown (test_fixture *fixture, gconstpointer user_data) nm_platform_link_delete (NM_PLATFORM_GET, fixture->ifindex1); } +NMTstpSetupFunc const _nmtstp_setup_platform_func = nm_linux_platform_setup; + void _nmtstp_init_tests (int *argc, char ***argv) { |