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

libvfio-user: set COMMON_CFLAGS for external_code tests 



Static compilation for external_code tests uses SYS_LIBS
that now includes libvfio-user. As such the COMMON_CFLAGS
need to point to the build directory.

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


Community-CI: Broadcom CI
Reviewed-by: default avatarKarol Latecki <karol.latecki@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
parent 3e5ea7ff

test/external_code/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ endif 
ifneq ($(DPDK_LIB_DIR),)

COMMON_CFLAGS+=-L$(DPDK_LIB_DIR)

endif



ifneq ($(VFIO_LIB_DIR),)

COMMON_CFLAGS+=-L$(VFIO_LIB_DIR)

endif

export

.PHONY: all

test/external_code/test_make.sh

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 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 LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$SPDK_LIB_DIR:$DPDK_LIB_DIR:"$test_root/passthru"

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"



# 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_tc1" make -C $test_root hello_world_bdev_shared_combo