From fd472f9427931092bab8d676798bc3f9744a552b Mon Sep 17 00:00:00 2001 From: James Simmons Date: Fri, 27 Jul 2018 19:55:49 -0400 Subject: [PATCH] LU-10627 tests: don't use libtool wrapper for applications It is a common pratice of lustre developers to test within the lustre tree without actually installing lustre onto the local node. In order for this to work the test suite needs to use the binary executables instead of the libtool executable wrappers. Add in the libtool LDFLAG to prevent the creation of the wrappers for the lustre utils. Additionally properly set LD_LIBRARY_PATH to where libtool caches the dynamic libraries. Change-Id: I9570fcb65b927463076f28c47ecec924602bef4e Signed-off-by: James Simmons Reviewed-on: https://review.whamcloud.com/32835 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Quentin Bouget Reviewed-by: Oleg Drokin --- lustre/tests/Makefile.am | 1 + lustre/tests/test-framework.sh | 2 +- lustre/utils/Makefile.am | 1 + lustre/utils/gss/Makefile.am | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lustre/tests/Makefile.am b/lustre/tests/Makefile.am index c77958c..1e9f6ec 100644 --- a/lustre/tests/Makefile.am +++ b/lustre/tests/Makefile.am @@ -1,6 +1,7 @@ # Lustre test Makefile AM_CFLAGS := -fPIC -D_GNU_SOURCE \ -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 +AM_LDFLAGS := -no-install DIST_SUBDIRS = mpi diff --git a/lustre/tests/test-framework.sh b/lustre/tests/test-framework.sh index 2c580b7..98b107e 100755 --- a/lustre/tests/test-framework.sh +++ b/lustre/tests/test-framework.sh @@ -45,7 +45,7 @@ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)} . $LUSTRE/tests/functions.sh . $LUSTRE/tests/yaml.sh -export LD_LIBRARY_PATH=${LUSTRE}/utils:${LD_LIBRARY_PATH} +export LD_LIBRARY_PATH=${LUSTRE}/utils/.libs:${LUSTRE}/utils:${LD_LIBRARY_PATH} LUSTRE_TESTS_CFG_DIR=${LUSTRE_TESTS_CFG_DIR:-${LUSTRE}/tests/cfg} diff --git a/lustre/utils/Makefile.am b/lustre/utils/Makefile.am index e6d3e917..a574817 100644 --- a/lustre/utils/Makefile.am +++ b/lustre/utils/Makefile.am @@ -2,6 +2,7 @@ AM_CFLAGS := -fPIC -D_GNU_SOURCE \ -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 +AM_LDFLAGS := -no-install if TESTS EXTRA_PROGRAMS = wirecheck diff --git a/lustre/utils/gss/Makefile.am b/lustre/utils/gss/Makefile.am index f11b3c3..437a2e5 100644 --- a/lustre/utils/gss/Makefile.am +++ b/lustre/utils/gss/Makefile.am @@ -3,6 +3,7 @@ AM_CFLAGS := -fPIC \ -D_LARGEFILE64_SOURCE=1 -D_FILE_OFFSET_BITS=64 -DLUSTRE_UTILS=1 \ -D_GNU_SOURCE +AM_LDFLAGS := -no-install sbin_PROGRAMS = lsvcgssd l_idmap @@ -61,7 +62,6 @@ lsvcgssd_SOURCES = \ svcgssd_main_loop.c \ svcgssd_mech2file.c \ svcgssd_proc.c \ - \ cacheio.h \ svcgssd.h -- 1.8.3.1