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

test/nvme_ns_cmd_ut: remove duplicate g_spdk_nvme_driver definition

Browse Source 
This test already links nvme.c via OTHER_FILES, which provides the
g_spdk_nvme_driver definition.

Also make g_request static while we're here, since it is only used
within this test file.

Change-Id: I9f1a2a7b3d40d2ea0989f6f781a4d220afbd3f0e
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2017-01-19 10:10:38 -07:00
parent 4f6cc16e2f
commit d14c2443e4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c
View File

@ -37,14 +37,12 @@
#include "lib/nvme/unit/test_env.c" #include "lib/nvme/unit/test_env.c"
struct nvme_driver _g_nvme_driver = { static struct nvme_driver _g_nvme_driver = {
.lock = PTHREAD_MUTEX_INITIALIZER, .lock = PTHREAD_MUTEX_INITIALIZER,
.request_mempool = NULL, .request_mempool = NULL,
}; };
struct nvme_driver *g_spdk_nvme_driver = &_g_nvme_driver; static struct nvme_request *g_request = NULL;
struct nvme_request *g_request = NULL;
int int
spdk_pci_nvme_enumerate(spdk_pci_enum_cb enum_cb, void *enum_ctx) spdk_pci_nvme_enumerate(spdk_pci_enum_cb enum_cb, void *enum_ctx)
@ -907,6 +905,8 @@ int main(int argc, char **argv)
return CU_get_error(); return CU_get_error();
} }
g_spdk_nvme_driver = &_g_nvme_driver;
CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_set_mode(CU_BRM_VERBOSE);
CU_basic_run_tests(); CU_basic_run_tests();
num_failures = CU_get_number_of_failures(); num_failures = CU_get_number_of_failures();