Let's test installing with meson as part of Travis and the
devtools/test-meson-builds.sh script.
The resulting headers and binaries make more sense to run checks
against, since they should be the same as what the final users get.
In this patch, test-null.sh is now called on an installed testpmd.
For this to work LD_LIBRARY_PATH must be set appropriately, but it can
be hard to debug, so a call to ldd has been added.
The (future) ABI compatibility checks will also need to filter its report
against installed public headers.
Signed-off-by: David Marchand <david.march...@redhat.com>
---
.ci/linux-build.sh | 6 +++++-
devtools/test-meson-builds.sh | 27 ++++++++++++++++-----------
devtools/test-null.sh | 1 +
3 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index ccc3a7ccd..e61aa2b0a 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -29,11 +29,15 @@ if [ "$BUILD_32BIT" = "1" ]; then
fi
OPTS="$OPTS --default-library=$DEF_LIB"
+OPTS="$OPTS --prefix=/usr -Dlibdir=lib"
meson build --werror -Dexamples=all $OPTS
ninja -C build
+DESTDIR=$(pwd)/install ninja -C build install
if [ "$AARCH64" != "1" ]; then
- devtools/test-null.sh
+ export LD_LIBRARY_PATH=$(pwd)/install/usr/lib
+ devtools/test-null.sh install/usr/bin/dpdk-testpmd
+ unset LD_LIBRARY_PATH
fi
if [ "$RUN_TESTS" = "1" ]; then
diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index aed175889..254588ae6 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -63,7 +63,7 @@ config () # <dir> <builddir> <meson options>
shift
builddir=$1
shift
- options="--werror -Dexamples=all"
+ options="--werror -Dexamples=all --prefix=/usr -Dlibdir=lib"
for option in $DPDK_MESON_OPTIONS ; do
options="$options -D$option"
done
@@ -74,22 +74,29 @@ config () # <dir> <builddir> <meson options>
fi
}
-compile () # <builddir>
+compile () # <builddir> <installdir>
{
builddir=$1
shift
+ export DESTDIR=$1
+ shift
+ rm -rf $DESTDIR
if [ -n "$TEST_MESON_BUILD_VERY_VERBOSE" ] ; then
# for full output from ninja use "-v"
echo "$ninja_cmd -v -C $builddir"
$ninja_cmd -v -C $builddir
+ $ninja_cmd -v -C $builddir install
elif [ -n "$TEST_MESON_BUILD_VERBOSE" ] ; then
# for keeping the history of short cmds, pipe through cat
echo "$ninja_cmd -C $builddir | cat"
$ninja_cmd -C $builddir | cat
+ $ninja_cmd -C $builddir install | cat
else
echo "$ninja_cmd -C $builddir"
$ninja_cmd -C $builddir
+ $ninja_cmd -C $builddir install
fi
+ unset DESTDIR
}
build () # <directory> <target compiler> <meson options>
@@ -102,7 +109,8 @@ build () # <directory> <target compiler> <meson options>
command -v ${CC##* } >/dev/null 2>&1 || return 0
load_env $targetcc || return 0
config $srcdir $builds_dir/$targetdir $*
- compile $builds_dir/$targetdir
+ compile $builds_dir/$targetdir \
+ $(readlink -f $builds_dir/$targetdir/install)
}
if [ "$1" = "-vv" ] ; then
@@ -134,7 +142,7 @@ ok=$(cc -march=$default_machine -E - < /dev/null >
/dev/null 2>&1 || echo false)
if [ "$ok" = "false" ] ; then
default_machine='corei7'
fi
-build build-x86-default cc -Dlibdir=lib -Dmachine=$default_machine $use_shared
+build build-x86-default cc -Dmachine=$default_machine $use_shared
c=aarch64-linux-gnu-gcc
# generic armv8a with clang as host compiler
@@ -150,12 +158,9 @@ for f in $srcdir/config/arm/arm64_[bdo]*gcc ; do
unset CC
done
-# Test installation of the x86-default target, to be used for checking
-# the sample apps build using the pkg-config file for cflags and libs
-build_path=$(readlink -f $builds_dir/build-x86-default)
-export DESTDIR=$build_path/install-root
-$ninja_cmd -C $build_path install
-
+# Use the x86-default target, to check the sample apps build using the
+# pkg-config file for cflags and libs
+export DESTDIR=$(readlink -f $builds_dir/build-x86-default/install)
load_env cc
pc_file=$(find $DESTDIR -name libdpdk.pc)
export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH
@@ -165,6 +170,6 @@ if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then
export PKGCONF="pkg-config --define-prefix"
for example in cmdline helloworld l2fwd l3fwd skeleton timer; do
echo "## Building $example"
- $MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean
all
+ $MAKE -C $DESTDIR/usr/share/dpdk/examples/$example clean all
done
fi
diff --git a/devtools/test-null.sh b/devtools/test-null.sh
index 548de8113..8121ec9e3 100755
--- a/devtools/test-null.sh
+++ b/devtools/test-null.sh
@@ -21,6 +21,7 @@ fi
if ldd $testpmd | grep -q librte_ ; then
export LD_LIBRARY_PATH=$build/drivers:$build/lib:$LD_LIBRARY_PATH
+ ldd $testpmd
libs='-d librte_mempool_ring.so -d librte_pmd_null.so'
else
libs=
--
2.23.0
