From c9fb57a298248144bf7a21c7cdda6ec148c1f7c6 Mon Sep 17 00:00:00 2001 From: Seth Howell Date: Thu, 22 Mar 2018 15:33:19 -0700 Subject: [PATCH] test: move test_env.c under test/common/lib This file is accessed by files in multiple directories under test. Change-Id: I634481fb58eab5c097aaece5289f88e531954fcb Signed-off-by: Seth Howell Reviewed-on: https://review.gerrithub.io/404976 Tested-by: SPDK Automated Test System Reviewed-by: Daniel Verkamp Reviewed-by: Jim Harris --- test/{ => common}/lib/test_env.c | 0 test/lib/env/memory/memory_ut.c | 2 +- test/unit/lib/bdev/bdev.c/bdev_ut.c | 2 +- test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c | 2 +- test/unit/lib/bdev/mt/bdev.c/bdev_ut.c | 2 +- test/unit/lib/bdev/part.c/part_ut.c | 2 +- test/unit/lib/bdev/pmem/bdev_pmem_ut.c | 2 +- test/unit/lib/blob/blob.c/blob_ut.c | 2 +- test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c | 2 +- test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c | 2 +- test/unit/lib/lvol/lvol.c/lvol_ut.c | 2 +- test/unit/lib/nvme/nvme.c/nvme_ut.c | 2 +- test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c | 2 +- test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c | 2 +- test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c | 2 +- test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c | 2 +- test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c | 2 +- test/unit/lib/util/io_channel.c/io_channel_ut.c | 2 +- test/unit/lib/vhost/vhost.c/vhost_ut.c | 2 +- test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c | 2 +- test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename test/{ => common}/lib/test_env.c (100%) diff --git a/test/lib/test_env.c b/test/common/lib/test_env.c similarity index 100% rename from test/lib/test_env.c rename to test/common/lib/test_env.c diff --git a/test/lib/env/memory/memory_ut.c b/test/lib/env/memory/memory_ut.c index bef6d57ca..369af98c8 100644 --- a/test/lib/env/memory/memory_ut.c +++ b/test/lib/env/memory/memory_ut.c @@ -33,7 +33,7 @@ #include "env_dpdk/memory.c" -#include "test_env.c" +#include "common/lib/test_env.c" #include "spdk_cunit.h" #include "spdk/bit_array.h" diff --git a/test/unit/lib/bdev/bdev.c/bdev_ut.c b/test/unit/lib/bdev/bdev.c/bdev_ut.c index 1e68a1ebe..537462d2f 100644 --- a/test/unit/lib/bdev/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/bdev.c/bdev_ut.c @@ -33,7 +33,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "unit/lib/json_mock.c" /* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */ diff --git a/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c b/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c index e31bd1267..f38c9d5d7 100644 --- a/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c +++ b/test/unit/lib/bdev/gpt/gpt.c/gpt_ut.c @@ -33,7 +33,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "bdev/gpt/gpt.c" diff --git a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c index bcd527112..9664c1550 100644 --- a/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c +++ b/test/unit/lib/bdev/mt/bdev.c/bdev_ut.c @@ -33,7 +33,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "unit/lib/json_mock.c" #include "lib/ut_multithread.c" diff --git a/test/unit/lib/bdev/part.c/part_ut.c b/test/unit/lib/bdev/part.c/part_ut.c index 437824919..0d1ee44e0 100644 --- a/test/unit/lib/bdev/part.c/part_ut.c +++ b/test/unit/lib/bdev/part.c/part_ut.c @@ -33,7 +33,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "unit/lib/json_mock.c" /* HACK: disable VTune integration so the unit test doesn't need VTune headers and libs to build */ diff --git a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c index 92b33ccde..a9eb09ba6 100644 --- a/test/unit/lib/bdev/pmem/bdev_pmem_ut.c +++ b/test/unit/lib/bdev/pmem/bdev_pmem_ut.c @@ -33,7 +33,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "unit/lib/json_mock.c" #include "bdev/pmem/bdev_pmem.c" diff --git a/test/unit/lib/blob/blob.c/blob_ut.c b/test/unit/lib/blob/blob.c/blob_ut.c index af58e2441..8ee494701 100644 --- a/test/unit/lib/blob/blob.c/blob_ut.c +++ b/test/unit/lib/blob/blob.c/blob_ut.c @@ -36,7 +36,7 @@ #include "spdk_cunit.h" #include "spdk/blob.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "../bs_dev_common.c" #include "blob/blobstore.c" #include "blob/request.c" diff --git a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c index aa78f3b33..693edef29 100644 --- a/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c +++ b/test/unit/lib/blobfs/blobfs_async_ut/blobfs_async_ut.c @@ -35,7 +35,7 @@ #include "CUnit/Basic.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "spdk_cunit.h" #include "blobfs/blobfs.c" diff --git a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c index 8186e8f03..1fb36598a 100644 --- a/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c +++ b/test/unit/lib/blobfs/blobfs_sync_ut/blobfs_sync_ut.c @@ -41,7 +41,7 @@ #include "spdk_cunit.h" #include "unit/lib/blob/bs_dev_common.c" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "blobfs/blobfs.c" #include "blobfs/tree.c" diff --git a/test/unit/lib/lvol/lvol.c/lvol_ut.c b/test/unit/lib/lvol/lvol.c/lvol_ut.c index 617a924f1..3bf612cea 100644 --- a/test/unit/lib/lvol/lvol.c/lvol_ut.c +++ b/test/unit/lib/lvol/lvol.c/lvol_ut.c @@ -36,7 +36,7 @@ #include "spdk/io_channel.h" #include "spdk/util.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "lvol/lvol.c" diff --git a/test/unit/lib/nvme/nvme.c/nvme_ut.c b/test/unit/lib/nvme/nvme.c/nvme_ut.c index 44faf0f74..27b683b67 100644 --- a/test/unit/lib/nvme/nvme.c/nvme_ut.c +++ b/test/unit/lib/nvme/nvme.c/nvme_ut.c @@ -39,7 +39,7 @@ #include "spdk_internal/mock.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" DEFINE_STUB_V(nvme_ctrlr_fail, (struct spdk_nvme_ctrlr *ctrlr, bool hot_remove)) diff --git a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c index 5b113375c..215dec3cd 100644 --- a/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c +++ b/test/unit/lib/nvme/nvme_ctrlr.c/nvme_ctrlr_ut.c @@ -37,7 +37,7 @@ #include "spdk_internal/log.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" struct spdk_trace_flag SPDK_LOG_NVME = { .name = "nvme", diff --git a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c index bb35c8d69..3af9f68f2 100644 --- a/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c +++ b/test/unit/lib/nvme/nvme_ns.c/nvme_ns_ut.c @@ -37,7 +37,7 @@ #include "nvme/nvme_ns.c" -#include "lib/test_env.c" +#include "common/lib/test_env.c" SPDK_LOG_REGISTER_COMPONENT("nvme", SPDK_LOG_NVME) diff --git a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c index f95b751da..445972de7 100644 --- a/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c +++ b/test/unit/lib/nvme/nvme_ns_cmd.c/nvme_ns_cmd_ut.c @@ -36,7 +36,7 @@ #include "nvme/nvme_ns_cmd.c" #include "nvme/nvme.c" -#include "lib/test_env.c" +#include "common/lib/test_env.c" static struct nvme_driver _g_nvme_driver = { .lock = PTHREAD_MUTEX_INITIALIZER, diff --git a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c index 14f28bb40..d905506f3 100644 --- a/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c +++ b/test/unit/lib/nvme/nvme_pcie.c/nvme_pcie_ut.c @@ -35,7 +35,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "nvme/nvme_pcie.c" diff --git a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c index 90ac53f94..1fb5c8c39 100644 --- a/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c +++ b/test/unit/lib/nvme/nvme_qpair.c/nvme_qpair_ut.c @@ -35,7 +35,7 @@ #include "spdk_cunit.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" bool trace_flag = false; #define SPDK_LOG_NVME trace_flag diff --git a/test/unit/lib/util/io_channel.c/io_channel_ut.c b/test/unit/lib/util/io_channel.c/io_channel_ut.c index c70dfa1d4..3c62b1e6b 100644 --- a/test/unit/lib/util/io_channel.c/io_channel_ut.c +++ b/test/unit/lib/util/io_channel.c/io_channel_ut.c @@ -36,7 +36,7 @@ #include "spdk_cunit.h" #include "util/io_channel.c" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "lib/ut_multithread.c" static void diff --git a/test/unit/lib/vhost/vhost.c/vhost_ut.c b/test/unit/lib/vhost/vhost.c/vhost_ut.c index 5204e87a9..7912c7434 100644 --- a/test/unit/lib/vhost/vhost.c/vhost_ut.c +++ b/test/unit/lib/vhost/vhost.c/vhost_ut.c @@ -37,7 +37,7 @@ #include "spdk_cunit.h" #include "spdk/io_channel.h" #include "spdk_internal/mock.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "vhost/vhost.c" diff --git a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c index 1ea635441..a5a183f2d 100644 --- a/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c +++ b/test/unit/lib/vhost/vhost_blk.c/vhost_blk_ut.c @@ -36,7 +36,7 @@ #include "CUnit/Basic.h" #include "spdk_cunit.h" #include "spdk_internal/mock.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "vhost/vhost_blk.c" #include "unit/lib/vhost/test_vhost.c" diff --git a/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c b/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c index 740fe80af..b09a03883 100644 --- a/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c +++ b/test/unit/lib/vhost/vhost_scsi.c/vhost_scsi_ut.c @@ -36,7 +36,7 @@ #include "CUnit/Basic.h" #include "spdk_cunit.h" #include "spdk_internal/mock.h" -#include "lib/test_env.c" +#include "common/lib/test_env.c" #include "spdk/scsi.h" #include "vhost/vhost_scsi.c"