devtools: fix x86-default env when installing

Message ID 20201112133843.23970-1-david.marchand@redhat.com (mailing list archive)
State Accepted, archived
Headers
Series devtools: fix x86-default env when installing |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK
ci/travis-robot success Travis build: passed
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

David Marchand Nov. 12, 2020, 1:38 p.m. UTC
  While testing Thomas patch on this script verbosity, I noticed that we
load the x86-default environment after installing this target.
I did not see any problem with it, yet we should load corresponding
environment before installing a target.

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

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 devtools/test-meson-builds.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
  

Comments

Thomas Monjalon Nov. 12, 2020, 3:24 p.m. UTC | #1
12/11/2020 14:38, David Marchand:
> While testing Thomas patch on this script verbosity, I noticed that we
> load the x86-default environment after installing this target.
> I did not see any problem with it, yet we should load corresponding
> environment before installing a target.

Reworded first sentence to make it less personal ;)
"The x86-default environment was loaded after installing this target."
and applied, thanks.
  

Patch

diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh
index 469251b6ef..7b0d05ac3f 100755
--- a/devtools/test-meson-builds.sh
+++ b/devtools/test-meson-builds.sh
@@ -253,17 +253,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"