diff mbox series

[2/2] devtools: enable more config options in build test

Message ID 20200211235724.2970097-3-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Delegated to: David Marchand
Headers
Series cleanup makefile config and testing |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/travis-robot success Travis build: passed
ci/Intel-compilation fail apply issues

Commit Message

Thomas Monjalon Feb. 11, 2020, 11:57 p.m. UTC 
  The Linux kernel modules kni and igb_uio were disabled by default
so they need a new option (+kmods) for testing compilation.

Some recent features were not enabled in compilation testing:
	- mlx5 vDPA (depends on libibverbs)
	- ifpga (depends on libfdt)
	- ipn3ke (depends on libfdt)
	- Arm WFE

Check on libfdt availability is added, and not considered as a fix.

Fixes: 91a861e54164 ("config: disable Linux kernel modules by default")
Fixes: 95276abaaf0a ("vdpa/mlx5: introduce Mellanox vDPA driver")
Fixes: 1be7855d7739 ("eal: add wait until equal API")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 devtools/test-build.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Comments

David Marchand Feb. 12, 2020, 10 a.m. UTC | #1 
On Wed, Feb 12, 2020 at 12:57 AM Thomas Monjalon <thomas@monjalon.net> wrote:
>
> The Linux kernel modules kni and igb_uio were disabled by default
> so they need a new option (+kmods) for testing compilation.
>
> Some recent features were not enabled in compilation testing:
>         - mlx5 vDPA (depends on libibverbs)
>         - ifpga (depends on libfdt)
>         - ipn3ke (depends on libfdt)
>         - Arm WFE
>
> Check on libfdt availability is added, and not considered as a fix.
>
> Fixes: 91a861e54164 ("config: disable Linux kernel modules by default")
> Fixes: 95276abaaf0a ("vdpa/mlx5: introduce Mellanox vDPA driver")
> Fixes: 1be7855d7739 ("eal: add wait until equal API")
>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> ---
>  devtools/test-build.sh | 12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/devtools/test-build.sh b/devtools/test-build.sh
> index 330133e692..e6e40588c6 100755
> --- a/devtools/test-build.sh
> +++ b/devtools/test-build.sh
> @@ -14,6 +14,7 @@ default_path=$PATH
>  # - DPDK_DEP_BPF (y/[n])
>  # - DPDK_DEP_CFLAGS
>  # - DPDK_DEP_ELF (y/[n])
> +# - DPDK_DEP_FDT (y/[n])
>  # - DPDK_DEP_ISAL (y/[n])
>  # - DPDK_DEP_JSON (y/[n])
>  # - DPDK_DEP_LDFLAGS
> @@ -108,6 +109,7 @@ reset_env ()
>         unset DPDK_DEP_BPF
>         unset DPDK_DEP_CFLAGS
>         unset DPDK_DEP_ELF
> +       unset DPDK_DEP_FDT
>         unset DPDK_DEP_ISAL
>         unset DPDK_DEP_JSON
>         unset DPDK_DEP_LDFLAGS
> @@ -140,6 +142,8 @@ config () # <directory> <target> <options>
>                 # Built-in options (lowercase)
>                 ! echo $3 | grep -q '+default' || \
>                 sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config
> +               ! echo $3 | grep -q '+kmods' || \
> +               sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config
>                 echo $3 | grep -q '+next' || \
>                 sed -ri=""           's,(NEXT_ABI=)y,\1n,' $1/.config
>                 ! echo $3 | grep -q '+shared' || \
> @@ -151,6 +155,8 @@ config () # <directory> <target> <options>
>                 sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
>
>                 # Automatic configuration
> +               ! echo $2 | grep -q 'arm64' || \
> +               sed -ri=""        's,(ARM_USE_WFE=)n,\1y,' $1/.config
>                 test "$DPDK_DEP_NUMA" != n || \
>                 sed -ri=""             's,(NUMA.*=)y,\1n,' $1/.config
>                 sed -ri=""    's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
> @@ -159,10 +165,14 @@ config () # <directory> <target> <options>
>                 sed -ri=""       's,(RESOURCE_TAR=)n,\1y,' $1/.config
>                 test "$DPDK_DEP_BPF" != y || \
>                 sed -ri=""         's,(PMD_AF_XDP=)n,\1y,' $1/.config
> +               test "$DPDK_DEP_FDT" != y || \
> +               sed -ri=""   's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config
> +               test "$DPDK_DEP_FDT" != y || \
> +               sed -ri=""         's,(IPN3KE_PMD=)n,\1y,' $1/.config
>                 test "$DPDK_DEP_ISAL" != y || \
>                 sed -ri=""           's,(PMD_ISAL=)n,\1y,' $1/.config
>                 test "$DPDK_DEP_MLX" != y || \
> -               sed -ri=""           's,(MLX._PMD=)n,\1y,' $1/.config
> +               sed -ri=""          's,(MLX.*_PMD=)n,\1y,' $1/.config
>                 test "$DPDK_DEP_NFB" != y || \
>                 sed -ri=""            's,(NFB_PMD=)n,\1y,' $1/.config
>                 test "$DPDK_DEP_SZE" != y || \
> --
> 2.25.0
>

Acked-by: David Marchand <david.marchand@redhat.com>
diff mbox series

Patch

diff --git a/devtools/test-build.sh b/devtools/test-build.sh
index 330133e692..e6e40588c6 100755
--- a/devtools/test-build.sh
+++ b/devtools/test-build.sh
@@ -14,6 +14,7 @@  default_path=$PATH
 # - DPDK_DEP_BPF (y/[n])
 # - DPDK_DEP_CFLAGS
 # - DPDK_DEP_ELF (y/[n])
+# - DPDK_DEP_FDT (y/[n])
 # - DPDK_DEP_ISAL (y/[n])
 # - DPDK_DEP_JSON (y/[n])
 # - DPDK_DEP_LDFLAGS
@@ -108,6 +109,7 @@  reset_env ()
 	unset DPDK_DEP_BPF
 	unset DPDK_DEP_CFLAGS
 	unset DPDK_DEP_ELF
+	unset DPDK_DEP_FDT
 	unset DPDK_DEP_ISAL
 	unset DPDK_DEP_JSON
 	unset DPDK_DEP_LDFLAGS
@@ -140,6 +142,8 @@  config () # <directory> <target> <options>
 		# Built-in options (lowercase)
 		! echo $3 | grep -q '+default' || \
 		sed -ri="" 's,(RTE_MACHINE=")native,\1default,' $1/.config
+		! echo $3 | grep -q '+kmods' || \
+		sed -ri="" 's,(IGB_UIO=|KNI_KMOD=)n,\1y,' $1/.config
 		echo $3 | grep -q '+next' || \
 		sed -ri=""           's,(NEXT_ABI=)y,\1n,' $1/.config
 		! echo $3 | grep -q '+shared' || \
@@ -151,6 +155,8 @@  config () # <directory> <target> <options>
 		sed -ri="" 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config )
 
 		# Automatic configuration
+		! echo $2 | grep -q 'arm64' || \
+		sed -ri=""        's,(ARM_USE_WFE=)n,\1y,' $1/.config
 		test "$DPDK_DEP_NUMA" != n || \
 		sed -ri=""             's,(NUMA.*=)y,\1n,' $1/.config
 		sed -ri=""    's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config
@@ -159,10 +165,14 @@  config () # <directory> <target> <options>
 		sed -ri=""       's,(RESOURCE_TAR=)n,\1y,' $1/.config
 		test "$DPDK_DEP_BPF" != y || \
 		sed -ri=""         's,(PMD_AF_XDP=)n,\1y,' $1/.config
+		test "$DPDK_DEP_FDT" != y || \
+		sed -ri=""   's,(PMD_IFPGA_RAWDEV=)n,\1y,' $1/.config
+		test "$DPDK_DEP_FDT" != y || \
+		sed -ri=""         's,(IPN3KE_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_ISAL" != y || \
 		sed -ri=""           's,(PMD_ISAL=)n,\1y,' $1/.config
 		test "$DPDK_DEP_MLX" != y || \
-		sed -ri=""           's,(MLX._PMD=)n,\1y,' $1/.config
+		sed -ri=""          's,(MLX.*_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_NFB" != y || \
 		sed -ri=""            's,(NFB_PMD=)n,\1y,' $1/.config
 		test "$DPDK_DEP_SZE" != y || \