From d14c2443e4fa299f3a43dd37ecadc64186298439 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Thu, 19 Jan 2017 10:10:38 -0700 Subject: [PATCH] test/nvme_ns_cmd_ut: remove duplicate g_spdk_nvme_driver definition 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 --- test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c b/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c index fb850c313..dce977a8e 100644 --- a/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c +++ b/test/lib/nvme/unit/nvme_ns_cmd_c/nvme_ns_cmd_ut.c @@ -37,14 +37,12 @@ #include "lib/nvme/unit/test_env.c" -struct nvme_driver _g_nvme_driver = { +static struct nvme_driver _g_nvme_driver = { .lock = PTHREAD_MUTEX_INITIALIZER, .request_mempool = NULL, }; -struct nvme_driver *g_spdk_nvme_driver = &_g_nvme_driver; - -struct nvme_request *g_request = NULL; +static struct nvme_request *g_request = NULL; int 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(); } + g_spdk_nvme_driver = &_g_nvme_driver; + CU_basic_set_mode(CU_BRM_VERBOSE); CU_basic_run_tests(); num_failures = CU_get_number_of_failures();