Commit b8a51a93 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki
Browse files

test/common: move all LIB paths to autotest_common.sh 



The common file is sourced in all test scripts, so it
is ideal place to put all library paths.

It will make changes to those paths simpler in next patch.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: Ic37148e6be669f296e8561d6554e735132941413
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/6685


Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 097ccf06

autotest.sh

+0 −3
Original line number Diff line number Diff line
@@ -9,9 +9,6 @@ if [[ ! -f $1 ]]; then 
	exit 1

fi



# always test with SPDK shared objects.

export SPDK_LIB_DIR="$rootdir/build/lib"



# Autotest.sh, as part of autorun.sh, runs in a different

# shell process than autobuild.sh. Use helper file to pass

# over env variable containing libraries paths.

test/common/autotest_common.sh

+4 −1
Original line number Diff line number Diff line
@@ -156,8 +156,11 @@ export SPDK_TEST_SCHEDULER 
: ${SPDK_TEST_SCANBUILD:=0}

export SPDK_TEST_SCANBUILD



# always test with SPDK shared objects.

export SPDK_LIB_DIR="$rootdir/build/lib"

export DPDK_LIB_DIR="${SPDK_RUN_EXTERNAL_DPDK:-$rootdir/dpdk/build}/lib"

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SPDK_LIB_DIR:$DPDK_LIB_DIR

export VFIO_LIB_DIR="$rootdir/libvfio-user/build/release/lib"

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SPDK_LIB_DIR:$DPDK_LIB_DIR:$VFIO_LIB_DIR



# Tell setup.sh to wait for block devices upon each reset

export PCI_BLOCK_SYNC_ON_RESET=yes

test/external_code/test_make.sh

+1 −4
Original line number Diff line number Diff line
@@ -22,10 +22,7 @@ $SPDK_DIR/configure --with-shared --without-isal --without-ocf --disable-asan $W 
make -C $SPDK_DIR -j$(nproc)



export SPDK_HEADER_DIR="$SPDK_DIR/include"

export SPDK_LIB_DIR="$SPDK_DIR/build/lib"

export DPDK_LIB_DIR="${SPDK_RUN_EXTERNAL_DPDK:-$SPDK_DIR/dpdk/build}/lib"

export VFIO_LIB_DIR="$SPDK_DIR/libvfio-user/build/release/lib"

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SPDK_LIB_DIR:$DPDK_LIB_DIR:$VFIO_LIB_DIR:"$test_root/passthru"

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$test_root/passthru"



# The default target is to make both the app and bdev and link them against the combined SPDK shared library libspdk.so.

run_test "external_make_hello_bdev_shared_combo" make -C $test_root hello_world_bdev_shared_combo

test/nvme/hw_hotplug.sh

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ testdir=$(readlink -f $(dirname $0)) 
rootdir=$(readlink -f $testdir/../..)

source $rootdir/test/common/autotest_common.sh



export SPDK_LIB_DIR="$rootdir/build/lib"

export DPDK_LIB_DIR="$rootdir/dpdk/build/lib"

export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SPDK_LIB_DIR:$DPDK_LIB_DIR



function insert_device() {

	ssh root@$ip 'Beetle --SetGpio "$gpio" HIGH'

	waitforblk $name