ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test: move lib/nvme up one directory

Browse Source 
Change-Id: I40c29b30c7098e34f2aa860612eeb82f2fb01ff3
Signed-off-by: Seth Howell <seth.howell@intel.com>
Reviewed-on: https://review.gerrithub.io/404974
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
This commit is contained in:
Seth Howell 2018-03-22 15:18:32 -07:00 committed by Jim Harris
parent b1bdc370ca
commit 8c5de263a1
28 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
autotest.sh
View File

@ -105,13 +105,13 @@ if [ $SPDK_TEST_EVENT -eq 1 ]; then
fi fi
if [ $SPDK_TEST_NVME -eq 1 ]; then if [ $SPDK_TEST_NVME -eq 1 ]; then
run_test test/lib/nvme/nvme.sh run_test test/nvme/nvme.sh
run_test test/lib/nvme/spdk_nvme_cli.sh run_test test/nvme/spdk_nvme_cli.sh
# Only test hotplug without ASAN enabled. Since if it is # Only test hotplug without ASAN enabled. Since if it is
# enabled, it catches SEGV earlier than our handler which # enabled, it catches SEGV earlier than our handler which
# breaks the hotplug logic # breaks the hotplug logic
if [ $SPDK_RUN_ASAN -eq 0 ]; then if [ $SPDK_RUN_ASAN -eq 0 ]; then
run_test test/lib/nvme/hotplug.sh intel run_test test/nvme/hotplug.sh intel
fi fi
fi fi

2
doc/vagrant.md
View File

@ -167,7 +167,7 @@ Bringing machine 'default' up with 'virtualbox' provider...
==> default: CC lib/blob/blobstore.o ==> default: CC lib/blob/blobstore.o
==> default: CC lib/bdev/bdev.o ==> default: CC lib/bdev/bdev.o
<< some output trimmed >> << some output trimmed >>
==> default: LINK test/lib/nvme/e2edp/nvme_dp ==> default: LINK test/nvme/e2edp/nvme_dp
==> default: Running provisioner: shell... ==> default: Running provisioner: shell...
default: Running: inline script default: Running: inline script
==> default: 0000:00:0e.0 (80ee 4e56): nvme -> uio_pci_generic ==> default: 0000:00:0e.0 (80ee 4e56): nvme -> uio_pci_generic

2
test/Makefile
View File

@ -35,7 +35,7 @@ SPDK_ROOT_DIR := $(abspath $(CURDIR)/..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
# These directories contain tests. # These directories contain tests.
TESTDIRS = app bdev blobfs cpp_headers lib unit TESTDIRS = app bdev blobfs cpp_headers lib nvme unit
DIRS-y = $(TESTDIRS) DIRS-y = $(TESTDIRS)

2
test/lib/Makefile
View File

@ -34,7 +34,7 @@
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..) SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)
include $(SPDK_ROOT_DIR)/mk/spdk.common.mk include $(SPDK_ROOT_DIR)/mk/spdk.common.mk
DIRS-y = env event json nvme DIRS-y = env event json
.PHONY: all clean $(DIRS-y) .PHONY: all clean $(DIRS-y)

2
test/lib/nvme/Makefile → test/nvme/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
DIRS-y = aer reset sgl e2edp overhead deallocated_value DIRS-y = aer reset sgl e2edp overhead deallocated_value

0
test/lib/nvme/aer/.gitignore → test/nvme/aer/.gitignore vendored
View File

2
test/lib/nvme/aer/Makefile → test/nvme/aer/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
APP = aer APP = aer

0
test/lib/nvme/aer/aer.c → test/nvme/aer/aer.c
View File

0
test/lib/nvme/deallocated_value/.gitignore → test/nvme/deallocated_value/.gitignore vendored
View File

2
test/lib/nvme/deallocated_value/Makefile → test/nvme/deallocated_value/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
APP = deallocated_value APP = deallocated_value

0
test/lib/nvme/deallocated_value/deallocated_value.c → test/nvme/deallocated_value/deallocated_value.c
View File

0
test/lib/nvme/e2edp/.gitignore → test/nvme/e2edp/.gitignore vendored
View File

2
test/lib/nvme/e2edp/Makefile → test/nvme/e2edp/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
APP = nvme_dp APP = nvme_dp

0
test/lib/nvme/e2edp/nvme_dp.c → test/nvme/e2edp/nvme_dp.c
View File

2
test/lib/nvme/hotplug.sh → test/nvme/hotplug.sh
View File

@ -3,7 +3,7 @@
set -xe set -xe
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../..)
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh
function ssh_vm() { function ssh_vm() {

4
test/lib/nvme/nvme.sh → test/nvme/nvme.sh
View File

@ -3,7 +3,7 @@
set -e set -e
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../..)
source $rootdir/scripts/common.sh source $rootdir/scripts/common.sh
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh
@ -140,7 +140,7 @@ $testdir/e2edp/nvme_dp
timing_exit e2edp timing_exit e2edp
timing_enter overhead timing_enter overhead
$rootdir/test/lib/nvme/overhead/overhead -s 4096 -t 1 -H $testdir/overhead/overhead -s 4096 -t 1 -H
timing_exit overhead timing_exit overhead
timing_enter arbitration timing_enter arbitration

0
test/lib/nvme/overhead/.gitignore → test/nvme/overhead/.gitignore vendored
View File

2
test/lib/nvme/overhead/Makefile → test/nvme/overhead/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
APP = overhead APP = overhead

0
test/lib/nvme/overhead/README → test/nvme/overhead/README
View File

0
test/lib/nvme/overhead/overhead.c → test/nvme/overhead/overhead.c
View File

0
test/lib/nvme/reset/.gitignore → test/nvme/reset/.gitignore vendored
View File

2
test/lib/nvme/reset/Makefile → test/nvme/reset/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
APP = reset APP = reset

0
test/lib/nvme/reset/reset.c → test/nvme/reset/reset.c
View File

0
test/lib/nvme/sgl/.gitignore → test/nvme/sgl/.gitignore vendored
View File

2
test/lib/nvme/sgl/Makefile → test/nvme/sgl/Makefile
View File

@ -31,7 +31,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # 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.common.mk
APP = sgl APP = sgl

0
test/lib/nvme/sgl/sgl.c → test/nvme/sgl/sgl.c
View File

2
test/lib/nvme/spdk_nvme_cli.sh → test/nvme/spdk_nvme_cli.sh
View File

@ -3,7 +3,7 @@
set -ex set -ex
testdir=$(readlink -f $(dirname $0)) testdir=$(readlink -f $(dirname $0))
rootdir=$(readlink -f $testdir/../../..) rootdir=$(readlink -f $testdir/../..)
source $rootdir/scripts/common.sh source $rootdir/scripts/common.sh
source $rootdir/test/common/autotest_common.sh source $rootdir/test/common/autotest_common.sh
spdk_nvme_cli="/home/sys_sgsw/nvme-cli" spdk_nvme_cli="/home/sys_sgsw/nvme-cli"

2
test/nvmf/host/aer.sh
View File

@ -30,7 +30,7 @@ timing_exit start_nvmf_tgt
bdevs="$bdevs $($rpc_py construct_malloc_bdev 64 512)" bdevs="$bdevs $($rpc_py construct_malloc_bdev 64 512)"
$rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" '' -a -s SPDK00000000000001 -n "$bdevs" $rpc_py construct_nvmf_subsystem nqn.2016-06.io.spdk:cnode1 "trtype:RDMA traddr:$NVMF_FIRST_TARGET_IP trsvcid:4420" '' -a -s SPDK00000000000001 -n "$bdevs"
$rootdir/test/lib/nvme/aer/aer -r "\ $rootdir/test/nvme/aer/aer -r "\
trtype:RDMA \ trtype:RDMA \
adrfam:IPv4 \ adrfam:IPv4 \
traddr:$NVMF_FIRST_TARGET_IP \ traddr:$NVMF_FIRST_TARGET_IP \