diff options
Diffstat (limited to 'src/devices/tests')
| -rw-r--r-- | src/devices/tests/Makefile.am | 1 | ||||
| -rw-r--r-- | src/devices/tests/Makefile.in | 1 | ||||
| -rw-r--r-- | src/devices/tests/test-lldp.c | 11 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/devices/tests/Makefile.am b/src/devices/tests/Makefile.am index e4f4d3fe..cd1ef6ed 100644 --- a/src/devices/tests/Makefile.am +++ b/src/devices/tests/Makefile.am @@ -12,7 +12,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) diff --git a/src/devices/tests/Makefile.in b/src/devices/tests/Makefile.in index 1cb73d28..31cf0d38 100644 --- a/src/devices/tests/Makefile.in +++ b/src/devices/tests/Makefile.in @@ -671,7 +671,6 @@ AM_CPPFLAGS = \ -I$(top_builddir)/src \ -DG_LOG_DOMAIN=\""NetworkManager"\" \ -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \ - -DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \ $(GLIB_CFLAGS) AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) diff --git a/src/devices/tests/test-lldp.c b/src/devices/tests/test-lldp.c index 85c3b510..1b7f536d 100644 --- a/src/devices/tests/test-lldp.c +++ b/src/devices/tests/test-lldp.c @@ -29,8 +29,7 @@ #include "nm-lldp-listener.h" #include "nm-sd.h" -#include "nm-sd-adapt.h" -#include "lldp.h" +#include "sd-lldp.h" #include "test-common.h" @@ -147,8 +146,8 @@ _test_recv_data0_check (GMainLoop *loop, NMLldpListener *listener) g_assert_cmpint (g_variant_n_children (neighbors), ==, 1); neighbor = get_lldp_neighbor (neighbors, - LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:02:03:04:05", - LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/3"); + SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:02:03:04:05", + SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/3"); g_assert (neighbor); g_assert_cmpint (g_variant_n_children (neighbor), ==, 4 + 4); @@ -244,8 +243,8 @@ _test_recv_data1_check (GMainLoop *loop, NMLldpListener *listener) g_assert_cmpint (g_variant_n_children (neighbors), ==, 1); neighbor = get_lldp_neighbor (neighbors, - LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:30:F9:AD:A0", - LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/1"); + SD_LLDP_CHASSIS_SUBTYPE_MAC_ADDRESS, "00:01:30:F9:AD:A0", + SD_LLDP_PORT_SUBTYPE_INTERFACE_NAME, "1/1"); g_assert (neighbor); g_assert_cmpint (g_variant_n_children (neighbor), ==, 4 + 10); |