From 86f65baba1c5097a174d13132111fa04a928fe2a Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 22 Mar 2018 16:23:30 -0700 Subject: [PATCH] test: move lib/event up one directory Change-Id: I4a8bfceaf00aea6f20a63d15b944990511f7958f Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/404979 Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris Tested-by: SPDK Automated Test System --- autotest.sh | 2 +- test/Makefile | 2 +- test/{lib => }/event/Makefile | 2 +- test/{lib => }/event/event.sh | 2 +- test/{lib => }/event/event_perf/.gitignore | 0 test/{lib => }/event/event_perf/Makefile | 2 +- test/{lib => }/event/event_perf/event_perf.c | 0 test/{lib => }/event/reactor/.gitignore | 0 test/{lib => }/event/reactor/Makefile | 2 +- test/{lib => }/event/reactor/reactor.c | 0 test/{lib => }/event/reactor_perf/.gitignore | 0 test/{lib => }/event/reactor_perf/Makefile | 2 +- test/{lib => }/event/reactor_perf/reactor_perf.c | 0 test/lib/Makefile | 2 +- 14 files changed, 8 insertions(+), 8 deletions(-) rename test/{lib => }/event/Makefile (97%) rename test/{lib => }/event/event.sh (87%) rename test/{lib => }/event/event_perf/.gitignore (100%) rename test/{lib => }/event/event_perf/Makefile (97%) rename test/{lib => }/event/event_perf/event_perf.c (100%) rename test/{lib => }/event/reactor/.gitignore (100%) rename test/{lib => }/event/reactor/Makefile (97%) rename test/{lib => }/event/reactor/reactor.c (100%) rename test/{lib => }/event/reactor_perf/.gitignore (100%) rename test/{lib => }/event/reactor_perf/Makefile (97%) rename test/{lib => }/event/reactor_perf/reactor_perf.c (100%) diff --git a/autotest.sh b/autotest.sh index badb1be11..68868e635 100755 --- a/autotest.sh +++ b/autotest.sh @@ -101,7 +101,7 @@ if [ $SPDK_TEST_BLOCKDEV -eq 1 ]; then fi if [ $SPDK_TEST_EVENT -eq 1 ]; then - run_test test/lib/event/event.sh + run_test test/event/event.sh fi if [ $SPDK_TEST_NVME -eq 1 ]; then diff --git a/test/Makefile b/test/Makefile index fc61af031..43ce5a2ab 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 env lib nvme unit +TESTDIRS = app bdev blobfs cpp_headers env event lib nvme unit DIRS-y = $(TESTDIRS) diff --git a/test/lib/event/Makefile b/test/event/Makefile similarity index 97% rename from test/lib/event/Makefile rename to test/event/Makefile index e9deaf298..b3e9cf1b0 100644 --- a/test/lib/event/Makefile +++ b/test/event/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 = event_perf reactor reactor_perf diff --git a/test/lib/event/event.sh b/test/event/event.sh similarity index 87% rename from test/lib/event/event.sh rename to test/event/event.sh index 9234efebc..e1d080b13 100755 --- a/test/lib/event/event.sh +++ b/test/event/event.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash testdir=$(readlink -f $(dirname $0)) -rootdir=$(readlink -f $testdir/../../..) +rootdir=$(readlink -f $testdir/../..) source $rootdir/test/common/autotest_common.sh timing_enter event diff --git a/test/lib/event/event_perf/.gitignore b/test/event/event_perf/.gitignore similarity index 100% rename from test/lib/event/event_perf/.gitignore rename to test/event/event_perf/.gitignore diff --git a/test/lib/event/event_perf/Makefile b/test/event/event_perf/Makefile similarity index 97% rename from test/lib/event/event_perf/Makefile rename to test/event/event_perf/Makefile index c63ca1bd0..8cd9c8a3e 100644 --- a/test/lib/event/event_perf/Makefile +++ b/test/event/event_perf/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.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk diff --git a/test/lib/event/event_perf/event_perf.c b/test/event/event_perf/event_perf.c similarity index 100% rename from test/lib/event/event_perf/event_perf.c rename to test/event/event_perf/event_perf.c diff --git a/test/lib/event/reactor/.gitignore b/test/event/reactor/.gitignore similarity index 100% rename from test/lib/event/reactor/.gitignore rename to test/event/reactor/.gitignore diff --git a/test/lib/event/reactor/Makefile b/test/event/reactor/Makefile similarity index 97% rename from test/lib/event/reactor/Makefile rename to test/event/reactor/Makefile index e32706fa3..bab970cf2 100644 --- a/test/lib/event/reactor/Makefile +++ b/test/event/reactor/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.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk diff --git a/test/lib/event/reactor/reactor.c b/test/event/reactor/reactor.c similarity index 100% rename from test/lib/event/reactor/reactor.c rename to test/event/reactor/reactor.c diff --git a/test/lib/event/reactor_perf/.gitignore b/test/event/reactor_perf/.gitignore similarity index 100% rename from test/lib/event/reactor_perf/.gitignore rename to test/event/reactor_perf/.gitignore diff --git a/test/lib/event/reactor_perf/Makefile b/test/event/reactor_perf/Makefile similarity index 97% rename from test/lib/event/reactor_perf/Makefile rename to test/event/reactor_perf/Makefile index efa4da5e0..4b19e52fb 100644 --- a/test/lib/event/reactor_perf/Makefile +++ b/test/event/reactor_perf/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.app.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk diff --git a/test/lib/event/reactor_perf/reactor_perf.c b/test/event/reactor_perf/reactor_perf.c similarity index 100% rename from test/lib/event/reactor_perf/reactor_perf.c rename to test/event/reactor_perf/reactor_perf.c diff --git a/test/lib/Makefile b/test/lib/Makefile index 3db47213d..896420f0a 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 = event json +DIRS-y = json .PHONY: all clean $(DIRS-y)