From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 7D7F3A04B5; Tue, 27 Oct 2020 18:38:49 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B4EF72BEA; Tue, 27 Oct 2020 18:38:47 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id CE2DA2BE3 for ; Tue, 27 Oct 2020 18:38:43 +0100 (CET) IronPort-SDR: 1TLut3lnmOL2H/6tLVqQtlB0RoFQxLG+cPv+G8H7G4QbNQAb7lnVfD7TQotlgl+Tx0Xul6j5T1 DeLsaOXQxAjA== X-IronPort-AV: E=McAfee;i="6000,8403,9787"; a="147415086" X-IronPort-AV: E=Sophos;i="5.77,424,1596524400"; d="scan'208";a="147415086" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Oct 2020 10:38:42 -0700 IronPort-SDR: 4fNp4DbtiaF7STMVF5WUno+JzZqy+kG2WJpXJp6K0v92cDRw0b081TBB55bgGVmPbnG4Hm5nL1 l+WDWlnS9osA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,424,1596524400"; d="scan'208";a="424482824" Received: from silpixa00399126.ir.intel.com ([10.237.222.4]) by fmsmga001.fm.intel.com with ESMTP; 27 Oct 2020 10:38:41 -0700 From: Bruce Richardson To: dev@dpdk.org Cc: thomas@monjalon.net, Bruce Richardson Date: Tue, 27 Oct 2020 17:38:36 +0000 Message-Id: <20201027173836.891184-1-bruce.richardson@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH] devtools/test-meson-builds: allow custom set of examples X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To test the installation process of DPDK using "ninja install" test-meson-builds.sh builds a subset of the examples using "make". To allow more flexibility for people testing, allow the set of examples chosen for this make test to be overridden using variable "DPDK_BUILD_TEST_EXAMPLES" in the environment. Since a number of example apps link against drivers directly even for shared builds, we need to ensure that LD_LIBRARY_PATH points to the main DPDK lib folder so any dependencies of those drivers can be found e.g. that the PCI/vdev bus driver .so is found. [All drivers are symlinked from drivers dir back to lib dir on install, so only one dir rather than two is needed in the path.] Signed-off-by: Bruce Richardson --- devtools/test-meson-builds.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/devtools/test-meson-builds.sh b/devtools/test-meson-builds.sh index a87de635a2..b9cde5b366 100755 --- a/devtools/test-meson-builds.sh +++ b/devtools/test-meson-builds.sh @@ -238,11 +238,15 @@ fi load_env cc pc_file=$(find $DESTDIR -name libdpdk.pc) export PKG_CONFIG_PATH=$(dirname $pc_file):$PKG_CONFIG_PATH +libdir=$(dirname $(find $DESTDIR -name librte_eal.so)) +export LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH + +examples_to_test=${DPDK_BUILD_TEST_EXAMPLES:-"cmdline helloworld l2fwd l3fwd skeleton timer"} # 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" - for example in cmdline helloworld l2fwd l3fwd skeleton timer; do + for example in $examples_to_test; do echo "## Building $example" $MAKE -C $DESTDIR/usr/local/share/dpdk/examples/$example clean shared static done -- 2.25.1