Skip to content

Commit

Permalink
devtools: fix x86-default build test install env
Browse files Browse the repository at this point in the history
The x86-default environment was loaded after installing this target.
I did not see any problem with it, yet we should load corresponding
environment before installing a target.

Fixes: bd253da ("devtools: fix test of ninja install")
Cc: stable@dpdk.org

Signed-off-by: David Marchand <david.marchand@redhat.com>
  • Loading branch information
david-marchand authored and tmonjalo committed Nov 12, 2020
1 parent a7a9199 commit 252e92e
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions devtools/test-meson-builds.sh
Original file line number Diff line number Diff line change
Expand Up @@ -255,17 +255,15 @@ 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
load_env cc
build_path=$(readlink -f $builds_dir/build-x86-default)
export DESTDIR=$build_path/install
# No need to reinstall if ABI checks are enabled
if [ -z "$DPDK_ABI_REF_VERSION" ]; then
install_target $build_path $DESTDIR
fi

load_env cc
pc_file=$(find $DESTDIR -name libdpdk.pc)
export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH

# if pkg-config defines the necessary flags, test building some examples
if pkg-config --define-prefix libdpdk >/dev/null 2>&1; then
export PKGCONF="pkg-config --define-prefix"
Expand Down

0 comments on commit 252e92e

Please sign in to comment.