[PATCH v2 1/3] buildtools/chkincs: relax checks on driver headers

[David Marchand]

Driver headers are common consumers of internal APIs, like for example
the ethdev_pci.h header consumed by net PCI drivers, which calls
internal symbols for allocating/releasing a ethdev port.

Checking that a driver header compiles without allowing internal APIs is
then highly likely to fail.

Relax the check and stop expecting driver headers could compile without
ALLOW_INTERNAL_API.

Signed-off-by: David Marchand <david.marchand at redhat.com>
---
 buildtools/chkincs/meson.build | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

diff --git a/buildtools/chkincs/meson.build b/buildtools/chkincs/meson.build
index 9a84c1cc25..df674f74ee 100644
--- a/buildtools/chkincs/meson.build
+++ b/buildtools/chkincs/meson.build
@@ -49,19 +49,13 @@ sources_drivers = files('main.c')
 sources_drivers += gen_c_files.process(dpdk_drivers_headers)
 
 executable('chkincs-drv', sources_drivers,
-        c_args: cflags,
-        include_directories: includes + includes_drivers,
-        dependencies: deps + deps_drivers,
-        install: false)
-
-executable('chkincs-drv-exp', sources_drivers,
-        c_args: [cflags, '-DALLOW_EXPERIMENTAL_API'],
+        c_args: [cflags, '-DALLOW_INTERNAL_API'],
         include_directories: includes + includes_drivers,
         dependencies: deps + deps_drivers,
         install: false)
 
 executable('chkincs-drv-all', sources_drivers,
-        c_args: [cflags, '-DALLOW_EXPERIMENTAL_API', '-DALLOW_INTERNAL_API'],
+        c_args: [cflags, '-DALLOW_INTERNAL_API', '-DALLOW_EXPERIMENTAL_API'],
         include_directories: includes + includes_drivers,
         dependencies: deps + deps_drivers,
         install: false)
@@ -101,20 +95,14 @@ cpp_sources_drivers = files('main.cpp')
 cpp_sources_drivers += gen_cpp_files.process(dpdk_drivers_headers)
 
 executable('chkincs-drv-cpp', cpp_sources_drivers,
-        cpp_args: ['-include', 'rte_config.h', cflags],
-        include_directories: includes + includes_drivers,
-        dependencies: deps + deps_drivers,
-        install: false)
-
-executable('chkincs-drv-cpp-exp', cpp_sources_drivers,
-        cpp_args: ['-include', 'rte_config.h', cflags, '-DALLOW_EXPERIMENTAL_API'],
+        cpp_args: ['-include', 'rte_config.h', cflags, '-DALLOW_INTERNAL_API'],
         include_directories: includes + includes_drivers,
         dependencies: deps + deps_drivers,
         install: false)
 
 executable('chkincs-drv-cpp-all', cpp_sources_drivers,
-        cpp_args: ['-include', 'rte_config.h', cflags, '-DALLOW_EXPERIMENTAL_API',
-                   '-DALLOW_INTERNAL_API'],
+        cpp_args: ['-include', 'rte_config.h', cflags, '-DALLOW_INTERNAL_API',
+                   '-DALLOW_EXPERIMENTAL_API'],
         include_directories: includes + includes_drivers,
         dependencies: deps + deps_drivers,
         install: false)
-- 
2.54.0