summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2023-08-03 08:16:03 +0200
committerThomas Haller <thaller@redhat.com>2023-08-03 09:28:44 +0200
commit4c1a119acf3ea8df3005bbe4a486f30e659fc8e5 (patch)
tree38c33fb4be6d264b6d6a3fe57798d3e262de70f8 /tests
parentca06372588166e099f76309dc4af1644ad639b14 (diff)
downloadlibnl-4c1a119acf3ea8df3005bbe4a486f30e659fc8e5.tar.gz
include: include private linux headers with explicit path
We have copies of the linux headers in include/linux-private. For those files, include the copies explicitly. No practice there is no difference, since we build with :-Ilinux-private".
Diffstat (limited to 'tests')
-rw-r--r--tests/check-direct.c2
-rw-r--r--tests/cksuite-all-attr.c5
-rw-r--r--tests/cksuite-all-ematch-tree-clone.c5
-rw-r--r--tests/cksuite-all-netns.c2
-rw-r--r--tests/test-cache-mngr.c2
-rw-r--r--tests/test-complex-HTB-with-hash-filters.c6
-rw-r--r--tests/test-create-bond.c2
-rw-r--r--tests/test-create-bridge.c2
-rw-r--r--tests/test-create-geneve.c2
-rw-r--r--tests/test-create-ifb.c4
-rw-r--r--tests/test-create-ipvlan.c2
-rw-r--r--tests/test-create-macsec.c4
-rw-r--r--tests/test-create-macvlan.c2
-rw-r--r--tests/test-create-macvtap.c2
-rw-r--r--tests/test-create-veth.c2
-rw-r--r--tests/test-create-vlan.c2
-rw-r--r--tests/test-create-vrf.c2
-rw-r--r--tests/test-create-vxlan.c2
-rw-r--r--tests/test-delete-link.c2
-rw-r--r--tests/test-genl.c3
-rw-r--r--tests/test-nf-cache-mngr.c2
-rw-r--r--tests/test-u32-filter-with-actions.c6
22 files changed, 30 insertions, 33 deletions
diff --git a/tests/check-direct.c b/tests/check-direct.c
index 8cb4932b..dd15dfcc 100644
--- a/tests/check-direct.c
+++ b/tests/check-direct.c
@@ -4,7 +4,7 @@
#include <check.h>
-#include <linux/snmp.h>
+#include <linux-private/linux/snmp.h>
#include <netlink/route/link.h>
diff --git a/tests/cksuite-all-attr.c b/tests/cksuite-all-attr.c
index 9b7f2d44..768abffb 100644
--- a/tests/cksuite-all-attr.c
+++ b/tests/cksuite-all-attr.c
@@ -5,15 +5,14 @@
#include "nl-default.h"
-#include <linux/netlink.h>
-#include <linux/if_ether.h>
+#include <linux-private/linux/netlink.h>
+#include <linux-private/linux/if_ether.h>
#include <netlink/attr.h>
#include <netlink/msg.h>
#include <netlink/route/cls/u32.h>
#include "cksuite-all.h"
-
#include "nl-aux-route/nl-route.h"
START_TEST(attr_size)
diff --git a/tests/cksuite-all-ematch-tree-clone.c b/tests/cksuite-all-ematch-tree-clone.c
index d86e25fc..58d95c1c 100644
--- a/tests/cksuite-all-ematch-tree-clone.c
+++ b/tests/cksuite-all-ematch-tree-clone.c
@@ -6,15 +6,14 @@
#include <time.h>
#include <check.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/route/cls/ematch.h>
+#include "cksuite-all.h"
#include "nl-aux-route/nl-route.h"
#include "nl-priv-dynamic-route/nl-priv-dynamic-route.h"
-#include "cksuite-all.h"
-
#define MAX_DEPTH 6
#define MAX_CHILDREN 5
diff --git a/tests/cksuite-all-netns.c b/tests/cksuite-all-netns.c
index 4414c4d8..d870b947 100644
--- a/tests/cksuite-all-netns.c
+++ b/tests/cksuite-all-netns.c
@@ -9,7 +9,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/route/link.h>
#include <netlink/route/link/sit.h>
diff --git a/tests/test-cache-mngr.c b/tests/test-cache-mngr.c
index d1f6a03b..1516dbde 100644
--- a/tests/test-cache-mngr.c
+++ b/tests/test-cache-mngr.c
@@ -7,7 +7,7 @@
#include <sys/time.h>
#include <time.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/cache.h>
diff --git a/tests/test-complex-HTB-with-hash-filters.c b/tests/test-complex-HTB-with-hash-filters.c
index fea72c44..3deff175 100644
--- a/tests/test-complex-HTB-with-hash-filters.c
+++ b/tests/test-complex-HTB-with-hash-filters.c
@@ -8,9 +8,9 @@
#include <stdio.h>
#include <string.h>
-#include <linux/if_ether.h>
-#include <linux/pkt_cls.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/if_ether.h>
+#include <linux-private/linux/pkt_cls.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/route/link.h>
#include <netlink/route/tc.h>
diff --git a/tests/test-create-bond.c b/tests/test-create-bond.c
index 6edb41f6..c938aa9e 100644
--- a/tests/test-create-bond.c
+++ b/tests/test-create-bond.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-bridge.c b/tests/test-create-bridge.c
index 758aaa21..9382d9e2 100644
--- a/tests/test-create-bridge.c
+++ b/tests/test-create-bridge.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-geneve.c b/tests/test-create-geneve.c
index 1816e5b6..18147138 100644
--- a/tests/test-create-geneve.c
+++ b/tests/test-create-geneve.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-ifb.c b/tests/test-create-ifb.c
index ed42b71c..c1e4f1cf 100644
--- a/tests/test-create-ifb.c
+++ b/tests/test-create-ifb.c
@@ -1,10 +1,8 @@
/* SPDX-License-Identifier: LGPL-2.1-only */
-#include <linux/netlink.h>
-
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-ipvlan.c b/tests/test-create-ipvlan.c
index b0b200c5..dd7d2b67 100644
--- a/tests/test-create-ipvlan.c
+++ b/tests/test-create-ipvlan.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-macsec.c b/tests/test-create-macsec.c
index b702f7d6..5b262400 100644
--- a/tests/test-create-macsec.c
+++ b/tests/test-create-macsec.c
@@ -2,8 +2,8 @@
#include "nl-default.h"
-#include <linux/netlink.h>
-#include <linux/if_link.h>
+#include <linux-private/linux/netlink.h>
+#include <linux-private/linux/if_link.h>
#include <netlink/route/link/macsec.h>
#include <netlink/netlink.h>
diff --git a/tests/test-create-macvlan.c b/tests/test-create-macvlan.c
index 665c5023..64912e79 100644
--- a/tests/test-create-macvlan.c
+++ b/tests/test-create-macvlan.c
@@ -4,7 +4,7 @@
#include <netinet/ether.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-macvtap.c b/tests/test-create-macvtap.c
index c3e19a73..3a063cf3 100644
--- a/tests/test-create-macvtap.c
+++ b/tests/test-create-macvtap.c
@@ -4,7 +4,7 @@
#include <netinet/ether.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-veth.c b/tests/test-create-veth.c
index fda4d2e8..36c60f13 100644
--- a/tests/test-create-veth.c
+++ b/tests/test-create-veth.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-vlan.c b/tests/test-create-vlan.c
index e2cd2b10..499ad79e 100644
--- a/tests/test-create-vlan.c
+++ b/tests/test-create-vlan.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-vrf.c b/tests/test-create-vrf.c
index b5f7176c..b1e0a7a0 100644
--- a/tests/test-create-vrf.c
+++ b/tests/test-create-vrf.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-create-vxlan.c b/tests/test-create-vxlan.c
index 6d2fd946..4eaa23ae 100644
--- a/tests/test-create-vxlan.c
+++ b/tests/test-create-vxlan.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-delete-link.c b/tests/test-delete-link.c
index 58c70f0e..55a0084b 100644
--- a/tests/test-delete-link.c
+++ b/tests/test-delete-link.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/netlink.h>
#include <netlink/route/link.h>
diff --git a/tests/test-genl.c b/tests/test-genl.c
index 6d15a2f7..afb3f69c 100644
--- a/tests/test-genl.c
+++ b/tests/test-genl.c
@@ -2,8 +2,9 @@
#include "nl-default.h"
+#include <linux-private/linux/genetlink.h>
+
#include <linux/taskstats.h>
-#include <linux/genetlink.h>
#include <netlink/cli/utils.h>
diff --git a/tests/test-nf-cache-mngr.c b/tests/test-nf-cache-mngr.c
index 7dcc9fc3..bb744400 100644
--- a/tests/test-nf-cache-mngr.c
+++ b/tests/test-nf-cache-mngr.c
@@ -2,7 +2,7 @@
#include "nl-default.h"
-#include <linux/netlink.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/cli/utils.h>
diff --git a/tests/test-u32-filter-with-actions.c b/tests/test-u32-filter-with-actions.c
index 1fe663c6..d970c276 100644
--- a/tests/test-u32-filter-with-actions.c
+++ b/tests/test-u32-filter-with-actions.c
@@ -10,9 +10,9 @@
#include <stdio.h>
#include <string.h>
-#include <linux/if_ether.h>
-#include <linux/tc_act/tc_mirred.h>
-#include <linux/netlink.h>
+#include <linux-private/linux/if_ether.h>
+#include <linux-private/linux/tc_act/tc_mirred.h>
+#include <linux-private/linux/netlink.h>
#include <netlink/route/link.h>
#include <netlink/route/tc.h>