From cd48a01fcb044a1d2aee5dd99f5f92e08197188e Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Mon, 9 May 2016 13:56:07 -0700 Subject: [PATCH] build: wrap $(CURDIR) relative paths in $(abspath) Resolve relative paths before using them to clean up command lines. This should also help shorten the overall command line length that gets embedded in the binary and used when locating the executable from a coredump. Change-Id: Ibff9849ede198bb04313496c8b7131485ffaf14f Signed-off-by: Daniel Verkamp --- examples/Makefile | 2 +- examples/ioat/Makefile | 2 +- examples/ioat/kperf/Makefile | 2 +- examples/ioat/perf/Makefile | 2 +- examples/ioat/verify/Makefile | 2 +- examples/nvme/Makefile | 2 +- examples/nvme/identify/Makefile | 2 +- examples/nvme/nvme_manage/Makefile | 2 +- examples/nvme/perf/Makefile | 2 +- examples/nvme/reserve/Makefile | 2 +- lib/Makefile | 2 +- lib/conf/Makefile | 2 +- lib/ioat/Makefile | 2 +- lib/json/Makefile | 2 +- lib/memory/Makefile | 2 +- lib/nvme/Makefile | 2 +- lib/util/Makefile | 2 +- mk/ioat.unittest.mk | 1 - mk/json.unittest.mk | 1 - mk/nvme.unittest.mk | 1 - test/Makefile | 2 +- test/lib/Makefile | 2 +- test/lib/ioat/Makefile | 2 +- test/lib/ioat/unit/Makefile | 2 +- test/lib/json/Makefile | 2 +- test/lib/json/parse/Makefile | 2 +- test/lib/json/util/Makefile | 2 +- test/lib/json/write/Makefile | 2 +- test/lib/memory/Makefile | 2 +- test/lib/nvme/Makefile | 2 +- test/lib/nvme/aer/Makefile | 2 +- test/lib/nvme/e2edp/Makefile | 2 +- test/lib/nvme/reset/Makefile | 2 +- test/lib/nvme/sgl/Makefile | 2 +- test/lib/nvme/unit/Makefile | 2 +- test/lib/nvme/unit/nvme_c/Makefile | 2 +- test/lib/nvme/unit/nvme_ctrlr_c/Makefile | 2 +- test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile | 2 +- test/lib/nvme/unit/nvme_ns_cmd_c/Makefile | 2 +- test/lib/nvme/unit/nvme_qpair_c/Makefile | 2 +- 40 files changed, 37 insertions(+), 40 deletions(-) diff --git a/examples/Makefile b/examples/Makefile index 7ecce5603..8c3722cc0 100644 --- a/examples/Makefile +++ b/examples/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += ioat nvme diff --git a/examples/ioat/Makefile b/examples/ioat/Makefile index fe1bce3c2..882bf8c91 100644 --- a/examples/ioat/Makefile +++ b/examples/ioat/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += perf verify kperf diff --git a/examples/ioat/kperf/Makefile b/examples/ioat/kperf/Makefile index 772d182c6..13544ce1b 100644 --- a/examples/ioat/kperf/Makefile +++ b/examples/ioat/kperf/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = ioat_kperf diff --git a/examples/ioat/perf/Makefile b/examples/ioat/perf/Makefile index b21d1c105..59db10b3f 100644 --- a/examples/ioat/perf/Makefile +++ b/examples/ioat/perf/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = perf diff --git a/examples/ioat/verify/Makefile b/examples/ioat/verify/Makefile index c0502be90..217a7d2ef 100644 --- a/examples/ioat/verify/Makefile +++ b/examples/ioat/verify/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = verify diff --git a/examples/nvme/Makefile b/examples/nvme/Makefile index 3fe0e31d8..65a3bf5c3 100644 --- a/examples/nvme/Makefile +++ b/examples/nvme/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += identify perf reserve nvme_manage diff --git a/examples/nvme/identify/Makefile b/examples/nvme/identify/Makefile index 4a40d8f47..528938044 100644 --- a/examples/nvme/identify/Makefile +++ b/examples/nvme/identify/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = identify diff --git a/examples/nvme/nvme_manage/Makefile b/examples/nvme/nvme_manage/Makefile index afdf91f73..bcaf5670a 100644 --- a/examples/nvme/nvme_manage/Makefile +++ b/examples/nvme/nvme_manage/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = nvme_manage diff --git a/examples/nvme/perf/Makefile b/examples/nvme/perf/Makefile index 4a9dd7a80..3684bffa7 100644 --- a/examples/nvme/perf/Makefile +++ b/examples/nvme/perf/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = perf diff --git a/examples/nvme/reserve/Makefile b/examples/nvme/reserve/Makefile index eba3e2288..4521c161b 100644 --- a/examples/nvme/reserve/Makefile +++ b/examples/nvme/reserve/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = reserve diff --git a/lib/Makefile b/lib/Makefile index d6f1b3859..e6b03aa07 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y += conf json memory util nvme ioat diff --git a/lib/conf/Makefile b/lib/conf/Makefile index c31ca0d45..5ffa79f0b 100644 --- a/lib/conf/Makefile +++ b/lib/conf/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) C_SRCS = conf.c LIBNAME = conf diff --git a/lib/ioat/Makefile b/lib/ioat/Makefile index 2fce04cb6..53b943636 100644 --- a/lib/ioat/Makefile +++ b/lib/ioat/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) CFLAGS += $(DPDK_INC) -include $(CONFIG_IOAT_IMPL) C_SRCS = ioat.c diff --git a/lib/json/Makefile b/lib/json/Makefile index 68c9964be..f3a11d704 100644 --- a/lib/json/Makefile +++ b/lib/json/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) C_SRCS = json_parse.c json_util.c json_write.c LIBNAME = json diff --git a/lib/memory/Makefile b/lib/memory/Makefile index 3f9869918..df0642a4e 100644 --- a/lib/memory/Makefile +++ b/lib/memory/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) CFLAGS += $(DPDK_INC) C_SRCS = vtophys.c diff --git a/lib/nvme/Makefile b/lib/nvme/Makefile index fbdecd146..1b2a1dfb4 100644 --- a/lib/nvme/Makefile +++ b/lib/nvme/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) CFLAGS += $(DPDK_INC) -include $(CONFIG_NVME_IMPL) C_SRCS = nvme_ctrlr_cmd.c nvme_ctrlr.c nvme_ns_cmd.c nvme_ns.c nvme_qpair.c nvme.c nvme_intel.c diff --git a/lib/util/Makefile b/lib/util/Makefile index b62f86d90..840b36cda 100644 --- a/lib/util/Makefile +++ b/lib/util/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) CFLAGS += $(DPDK_INC) C_SRCS = file.c string.c pci.c diff --git a/mk/ioat.unittest.mk b/mk/ioat.unittest.mk index 5546b48ea..2a9b01845 100644 --- a/mk/ioat.unittest.mk +++ b/mk/ioat.unittest.mk @@ -31,7 +31,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/.. IOAT_DIR := $(SPDK_ROOT_DIR)/lib/ioat include $(SPDK_ROOT_DIR)/mk/spdk.common.mk diff --git a/mk/json.unittest.mk b/mk/json.unittest.mk index cbbf6d73f..e6ee3c5ab 100644 --- a/mk/json.unittest.mk +++ b/mk/json.unittest.mk @@ -31,7 +31,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/.. include $(SPDK_ROOT_DIR)/mk/spdk.common.mk JSON_DIR := $(SPDK_ROOT_DIR)/lib/json diff --git a/mk/nvme.unittest.mk b/mk/nvme.unittest.mk index 757fadcbe..a1689c40d 100644 --- a/mk/nvme.unittest.mk +++ b/mk/nvme.unittest.mk @@ -31,7 +31,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))/.. NVME_DIR := $(SPDK_ROOT_DIR)/lib/nvme include $(SPDK_ROOT_DIR)/mk/spdk.common.mk diff --git a/test/Makefile b/test/Makefile index 69d9a57c1..ff9a850d8 100644 --- a/test/Makefile +++ b/test/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk # These directories contain tests. diff --git a/test/lib/Makefile b/test/lib/Makefile index 966b16fda..546a43349 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = json nvme memory ioat diff --git a/test/lib/ioat/Makefile b/test/lib/ioat/Makefile index afb48c439..61530673b 100644 --- a/test/lib/ioat/Makefile +++ b/test/lib/ioat/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = unit diff --git a/test/lib/ioat/unit/Makefile b/test/lib/ioat/unit/Makefile index 8bf46617b..cfe4d2990 100644 --- a/test/lib/ioat/unit/Makefile +++ b/test/lib/ioat/unit/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk TEST_FILE = ioat_ut.c diff --git a/test/lib/json/Makefile b/test/lib/json/Makefile index b074914ea..0a06e77cc 100644 --- a/test/lib/json/Makefile +++ b/test/lib/json/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = parse util write diff --git a/test/lib/json/parse/Makefile b/test/lib/json/parse/Makefile index 14c36ac61..981aad0a8 100644 --- a/test/lib/json/parse/Makefile +++ b/test/lib/json/parse/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) TEST_FILE = json_parse_ut.c diff --git a/test/lib/json/util/Makefile b/test/lib/json/util/Makefile index cafd1fbbb..820f6ef78 100644 --- a/test/lib/json/util/Makefile +++ b/test/lib/json/util/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) TEST_FILE = json_util_ut.c diff --git a/test/lib/json/write/Makefile b/test/lib/json/write/Makefile index 0bb706d87..6d75a6a00 100644 --- a/test/lib/json/write/Makefile +++ b/test/lib/json/write/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) TEST_FILE = json_write_ut.c diff --git a/test/lib/memory/Makefile b/test/lib/memory/Makefile index c615a351d..7804ce1be 100644 --- a/test/lib/memory/Makefile +++ b/test/lib/memory/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = vtophys diff --git a/test/lib/nvme/Makefile b/test/lib/nvme/Makefile index 9ab4a2857..89dc843b2 100644 --- a/test/lib/nvme/Makefile +++ b/test/lib/nvme/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = unit aer reset sgl e2edp diff --git a/test/lib/nvme/aer/Makefile b/test/lib/nvme/aer/Makefile index dc789c24c..23f5d2e8d 100644 --- a/test/lib/nvme/aer/Makefile +++ b/test/lib/nvme/aer/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = aer diff --git a/test/lib/nvme/e2edp/Makefile b/test/lib/nvme/e2edp/Makefile index 4a2c250c9..975360f48 100644 --- a/test/lib/nvme/e2edp/Makefile +++ b/test/lib/nvme/e2edp/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = nvme_dp diff --git a/test/lib/nvme/reset/Makefile b/test/lib/nvme/reset/Makefile index cc7344d68..55f0b7716 100644 --- a/test/lib/nvme/reset/Makefile +++ b/test/lib/nvme/reset/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = reset diff --git a/test/lib/nvme/sgl/Makefile b/test/lib/nvme/sgl/Makefile index 618f395f4..8cd76cd5f 100644 --- a/test/lib/nvme/sgl/Makefile +++ b/test/lib/nvme/sgl/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk APP = sgl diff --git a/test/lib/nvme/unit/Makefile b/test/lib/nvme/unit/Makefile index 6d979d6b4..b8ee86164 100644 --- a/test/lib/nvme/unit/Makefile +++ b/test/lib/nvme/unit/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = nvme_c nvme_ns_cmd_c nvme_qpair_c nvme_ctrlr_c nvme_ctrlr_cmd_c diff --git a/test/lib/nvme/unit/nvme_c/Makefile b/test/lib/nvme/unit/nvme_c/Makefile index c6fe86628..21aab7063 100644 --- a/test/lib/nvme/unit/nvme_c/Makefile +++ b/test/lib/nvme/unit/nvme_c/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ut.c diff --git a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile b/test/lib/nvme/unit/nvme_ctrlr_c/Makefile index f8b5210a7..e57121dd7 100644 --- a/test/lib/nvme/unit/nvme_ctrlr_c/Makefile +++ b/test/lib/nvme/unit/nvme_ctrlr_c/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ctrlr_ut.c OTHER_FILES = nvme_intel.c diff --git a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile b/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile index d4c6aa61e..6b5f44ee3 100644 --- a/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile +++ b/test/lib/nvme/unit/nvme_ctrlr_cmd_c/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ctrlr_cmd_ut.c diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile b/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile index 92f70dcd7..b8e920995 100644 --- a/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile +++ b/test/lib/nvme/unit/nvme_ns_cmd_c/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_ns_cmd_ut.c OTHER_FILES = nvme.c diff --git a/test/lib/nvme/unit/nvme_qpair_c/Makefile b/test/lib/nvme/unit/nvme_qpair_c/Makefile index b78789993..dc011094c 100644 --- a/test/lib/nvme/unit/nvme_qpair_c/Makefile +++ b/test/lib/nvme/unit/nvme_qpair_c/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(CURDIR)/../../../../.. +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../../..) TEST_FILE = nvme_qpair_ut.c