From dc14118bb24a993c4dddda777ff342cab741063b Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 22 Mar 2018 16:10:42 -0700 Subject: [PATCH] test: move lib/env up one level Change-Id: Ic22806e7c85f579329ac43b9a4e31eab2a14f1c0 Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/404978 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- autotest.sh | 2 +- test/Makefile | 2 +- test/{lib => }/env/Makefile | 2 +- test/{lib => }/env/env.sh | 2 +- test/{lib => }/env/memory/.gitignore | 0 test/{lib => }/env/memory/Makefile | 2 +- test/{lib => }/env/memory/memory_ut.c | 0 test/{lib => }/env/pci/.gitignore | 0 test/{lib => }/env/pci/Makefile | 2 +- test/{lib => }/env/pci/pci_ut.c | 0 test/{lib/env => env/vtophys}/.gitignore | 0 test/{lib => }/env/vtophys/Makefile | 2 +- test/{lib => }/env/vtophys/vtophys.c | 0 test/lib/Makefile | 2 +- 14 files changed, 8 insertions(+), 8 deletions(-) rename test/{lib => }/env/Makefile (97%) rename test/{lib => }/env/env.sh (89%) rename test/{lib => }/env/memory/.gitignore (100%) rename test/{lib => }/env/memory/Makefile (97%) rename test/{lib => }/env/memory/memory_ut.c (100%) rename test/{lib => }/env/pci/.gitignore (100%) rename test/{lib => }/env/pci/Makefile (97%) rename test/{lib => }/env/pci/pci_ut.c (100%) rename test/{lib/env => env/vtophys}/.gitignore (100%) rename test/{lib => }/env/vtophys/Makefile (97%) rename test/{lib => }/env/vtophys/vtophys.c (100%) diff --git a/autotest.sh b/autotest.sh index 6372b4cf7b..badb1be114 100755 --- a/autotest.sh +++ b/autotest.sh @@ -115,7 +115,7 @@ if [ $SPDK_TEST_NVME -eq 1 ]; then fi fi -run_test test/lib/env/env.sh +run_test test/env/env.sh if [ $SPDK_TEST_IOAT -eq 1 ]; then run_test test/ioat/ioat.sh diff --git a/test/Makefile b/test/Makefile index ed024023f1..fc61af031f 100644 --- a/test/Makefile +++ b/test/Makefile @@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk # These directories contain tests. -TESTDIRS = app bdev blobfs cpp_headers lib nvme unit +TESTDIRS = app bdev blobfs cpp_headers env lib nvme unit DIRS-y = $(TESTDIRS) diff --git a/test/lib/env/Makefile b/test/env/Makefile similarity index 97% rename from test/lib/env/Makefile rename to test/env/Makefile index 79a3d5ffa6..e340bd6ab9 100644 --- a/test/lib/env/Makefile +++ b/test/env/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk DIRS-y = memory pci vtophys diff --git a/test/lib/env/env.sh b/test/env/env.sh similarity index 89% rename from test/lib/env/env.sh rename to test/env/env.sh index 1e5936a398..7aa560f2e9 100755 --- a/test/lib/env/env.sh +++ b/test/env/env.sh @@ -3,7 +3,7 @@ set -e testdir=$(readlink -f $(dirname $0)) -rootdir=$(readlink -f $testdir/../../..) +rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh timing_enter env diff --git a/test/lib/env/memory/.gitignore b/test/env/memory/.gitignore similarity index 100% rename from test/lib/env/memory/.gitignore rename to test/env/memory/.gitignore diff --git a/test/lib/env/memory/Makefile b/test/env/memory/Makefile similarity index 97% rename from test/lib/env/memory/Makefile rename to test/env/memory/Makefile index c121489cf0..1a9b208df5 100644 --- a/test/lib/env/memory/Makefile +++ b/test/env/memory/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/lib/env/memory/memory_ut.c b/test/env/memory/memory_ut.c similarity index 100% rename from test/lib/env/memory/memory_ut.c rename to test/env/memory/memory_ut.c diff --git a/test/lib/env/pci/.gitignore b/test/env/pci/.gitignore similarity index 100% rename from test/lib/env/pci/.gitignore rename to test/env/pci/.gitignore diff --git a/test/lib/env/pci/Makefile b/test/env/pci/Makefile similarity index 97% rename from test/lib/env/pci/Makefile rename to test/env/pci/Makefile index a0fa4ee66f..e41c7fd33b 100644 --- a/test/lib/env/pci/Makefile +++ b/test/env/pci/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/lib/env/pci/pci_ut.c b/test/env/pci/pci_ut.c similarity index 100% rename from test/lib/env/pci/pci_ut.c rename to test/env/pci/pci_ut.c diff --git a/test/lib/env/.gitignore b/test/env/vtophys/.gitignore similarity index 100% rename from test/lib/env/.gitignore rename to test/env/vtophys/.gitignore diff --git a/test/lib/env/vtophys/Makefile b/test/env/vtophys/Makefile similarity index 97% rename from test/lib/env/vtophys/Makefile rename to test/env/vtophys/Makefile index 2f0d13ae4f..b3553b6ca1 100644 --- a/test/lib/env/vtophys/Makefile +++ b/test/env/vtophys/Makefile @@ -31,7 +31,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../../..) +SPDK_ROOT_DIR := $(abspath $(CURDIR)/../../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.app.mk diff --git a/test/lib/env/vtophys/vtophys.c b/test/env/vtophys/vtophys.c similarity index 100% rename from test/lib/env/vtophys/vtophys.c rename to test/env/vtophys/vtophys.c diff --git a/test/lib/Makefile b/test/lib/Makefile index eb6dc65305..3db47213d0 100644 --- a/test/lib/Makefile +++ b/test/lib/Makefile @@ -34,7 +34,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) include $(SPDK_ROOT_DIR)/mk/spdk.common.mk -DIRS-y = env event json +DIRS-y = event json .PHONY: all clean $(DIRS-y)