From b5eeb44cb4b5cb4aff333b67a0f0f58e48e45d14 Mon Sep 17 00:00:00 2001 From: Karol Latecki Date: Mon, 4 May 2020 16:57:14 +0200 Subject: [PATCH] test/make: Update ref build path for ABI tests Use 20.04 reference build instead of 20.01. Also updatethe NVMe-oF Makefile to reflect a change to the ABI since 20.04 was released. This has to be done in the same patch to keep the build from failing. Signed-off-by: Karol Latecki Change-Id: I3201f698ecb441021964debda760866dbbc01a64 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2171 Tested-by: SPDK CI Jenkins Community-CI: Mellanox Build Bot Reviewed-by: Jim Harris Reviewed-by: Aleksey Marchuk Reviewed-by: Darek Stojaczyk --- lib/nvmf/Makefile | 2 +- test/make/check_so_deps.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/nvmf/Makefile b/lib/nvmf/Makefile index 188fe12f1..2fa2d424e 100644 --- a/lib/nvmf/Makefile +++ b/lib/nvmf/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk SO_VER := 3 -SO_MINOR := 0 +SO_MINOR := 1 SO_SUFFIX := $(SO_VER).$(SO_MINOR) C_SRCS = ctrlr.c ctrlr_discovery.c ctrlr_bdev.c \ diff --git a/test/make/check_so_deps.sh b/test/make/check_so_deps.sh index 0ced7af16..ee9fe447e 100755 --- a/test/make/check_so_deps.sh +++ b/test/make/check_so_deps.sh @@ -10,7 +10,7 @@ source "$rootdir/test/common/autotest_common.sh" libdir="$rootdir/build/lib" libdeps_file="$rootdir/mk/spdk.lib_deps.mk" -source_abi_dir="$HOME/spdk_20_01/build/lib" +source_abi_dir="$HOME/spdk_20_04/build/lib" suppression_file="$HOME/abigail_suppressions.ini" function confirm_abi_deps() {