Rename HSE_UNIT_TEST_MODE to HSE_MOCKING

onlyone0001 · Mar 23, 2021 · d3534e0 · d3534e0
1 parent 8087a7e
commit d3534e0
Show file tree

Hide file tree

Showing 100 changed files with 199 additions and 195 deletions.
diff --git a/hsejni/tests/meson.build b/hsejni/tests/meson.build
@@ -2,7 +2,7 @@ hsejni_parse_test = executable(
 	'hsejni_parse_test',
 	['hsejni_parse_test.c'],
 	c_args: [
-		'-DHSE_UNIT_TEST_MODE=1',
+		'-DHSE_MOCKING=1',
 		'-DCOMPNAME="hsejni"',
 	],
 	include_directories: [

diff --git a/include/hse/hse.h b/include/hse/hse.h
@@ -1023,9 +1023,9 @@ hse_params_get(
 
 #pragma GCC visibility pop
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "hse_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #ifdef __cplusplus
 }

diff --git a/include/hse/hse_experimental.h b/include/hse/hse_experimental.h
@@ -121,9 +121,9 @@ hse_params_err_exp(const struct hse_params *params, char *buf, size_t buf_sz);
 
 #pragma GCC visibility pop
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "hse_experimental_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #ifdef __cplusplus
 }

diff --git a/lib/binding/kvdb_experimental_interface.c b/lib/binding/kvdb_experimental_interface.c
@@ -173,6 +173,6 @@ hse_kvs_prefix_probe_exp(
     return 0UL;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "hse_experimental_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/binding/kvdb_interface.c b/lib/binding/kvdb_interface.c
@@ -897,7 +897,7 @@ hse_err_to_errno(hse_err_t err)
 }
 
 /* Includes necessary files for mocking */
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "hse_ut_impl.i"
 #include "mpool_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/c0/c0.c b/lib/c0/c0.c
@@ -368,6 +368,6 @@ c0_hash_get(struct c0 *handle)
     return self->c0_hash;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "c0_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/c0/c0_kvmultiset.c b/lib/c0/c0_kvmultiset.c
@@ -1149,6 +1149,6 @@ c0kvms_fini(void)
     c0kvms_cache = NULL;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "c0_kvmultiset_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/c0/c0sk.c b/lib/c0/c0sk.c
@@ -1728,6 +1728,6 @@ c0sk_get_cn(struct c0sk_impl *c0sk, u64 skidx)
     return c0sk->c0sk_cnv[skidx];
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "c0sk_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/c0/c0sk_internal.c b/lib/c0/c0sk_internal.c
@@ -1416,6 +1416,6 @@ c0sk_putdel(
     return err;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "c0sk_internal_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/c0/c0sk_internal.h b/lib/c0/c0sk_internal.h
@@ -233,7 +233,7 @@ c0sk_putdel(
 struct cn *
 c0sk_get_cn(struct c0sk_impl *c0sk, u64 skidx);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "c0sk_internal_ut.h"
 #endif
 

diff --git a/lib/cn/bloom_reader.c b/lib/cn/bloom_reader.c
@@ -72,7 +72,7 @@ bloom_reader_buffer_lookup(const struct bloom_desc *desc, const u8 *bitmap, stru
     return bf_lookup(kt->kt_hash, bitmap, desc->bd_n_hashes, desc->bd_rotl, desc->bd_bktmask);
 }
 
-#if HSE_UNIT_TEST_MODE
+#if HSE_MOCKING
 merr_t
 bloom_reader_filter_info(struct bloom_desc *desc, u32 *hash_cnt, u32 *modulus)
 {

diff --git a/lib/cn/bloom_reader.h b/lib/cn/bloom_reader.h
@@ -65,7 +65,7 @@ bloom_reader_mcache_lookup(
     struct kvs_ktuple *         kt,
     bool *                      hit);
 
-#if HSE_UNIT_TEST_MODE
+#if HSE_MOCKING
 /**
  * bloom_reader_filter_info() - Retrieve the characteristics of the bloom filter
  * @blm_rgn_desc:  region descriptor of kblock's Bloom filter region

diff --git a/lib/cn/cn.c b/lib/cn/cn.c
@@ -1757,8 +1757,8 @@ cn_vma_mblock_max(struct cn *cn, enum mp_media_classp mclass)
     return vma_size_max / mblocksz;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_ut_impl.i"
 #include "cn_cursor_ut_impl.i"
 #include "cn_mblocks_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/cn_kvdb.c b/lib/cn/cn_kvdb.c
@@ -47,6 +47,6 @@ cn_kvdb_destroy(struct cn_kvdb *h)
         free(h2i(h));
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_kvdb_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/cn_mblocks.h b/lib/cn/cn_mblocks.h
@@ -75,8 +75,8 @@ cn_mblocks_destroy(
     bool                  kcompact,
     u32                   n_committed);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_mblocks_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cn_tree.c b/lib/cn/cn_tree.c
@@ -3640,12 +3640,12 @@ cn_tree_fini(void)
     }
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_ut_impl.i"
 #include "cn_tree_compact_ut_impl.i"
 #include "cn_tree_create_ut_impl.i"
 #include "cn_tree_cursor_ut_impl.i"
 #include "cn_tree_internal_ut_impl.i"
 #include "cn_tree_iter_ut_impl.i"
 #include "cn_tree_view_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/cn_tree.h b/lib/cn/cn_tree.h
@@ -129,8 +129,8 @@ cn_tree_init(void);
 void
 cn_tree_fini(void);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cn_tree_compact.h b/lib/cn/cn_tree_compact.h
@@ -266,8 +266,8 @@ cn_node_comp_token_get(struct cn_tree_node *tn);
 void
 cn_node_comp_token_put(struct cn_tree_node *tn);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_compact_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cn_tree_create.h b/lib/cn/cn_tree_create.h
@@ -103,8 +103,8 @@ cn_tree_insert_kvset(struct cn_tree *tree, struct kvset *kvset, uint level, uint
 void
 cn_tree_samp_init(struct cn_tree *tree);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_create_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cn_tree_cursor.h b/lib/cn/cn_tree_cursor.h
@@ -44,8 +44,8 @@ cn_tree_cursor_destroy(struct pscan *cur);
 merr_t
 cn_tree_cursor_active_kvsets(struct pscan *cur, u32 *active, u32 *total);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_cursor_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cn_tree_internal.h b/lib/cn/cn_tree_internal.h
@@ -250,8 +250,8 @@ cn_comp_cancel_cb(struct sts_job *job);
 void
 cn_comp_slice_cb(struct sts_job *job);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_internal_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif /* HSE_KVDB_CN_CN_TREE_INTERNAL_H */
diff --git a/lib/cn/cn_tree_iter.h b/lib/cn/cn_tree_iter.h
@@ -73,8 +73,8 @@ cn_tree_preorder_walk(
     cn_tree_walk_callback_fn *callback,
     void *                    rock);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_iter_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cn_tree_stats.h b/lib/cn/cn_tree_stats.h
@@ -21,8 +21,8 @@ cn_tree_perfc_shape_report(
     struct perfc_set *inode,
     struct perfc_set *lnode);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cn_tree_stats.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/cndb.c b/lib/cn/cndb.c
@@ -3337,9 +3337,9 @@ cndb_cn_initializer(unsigned int fanout_bits, unsigned int pfx_len, u64 cnid)
     return cn;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cndb_ut.h"
 #include "cndb_ut_impl.i"
 #include "cndb_internal_ut.h"
 #include "cndb_internal_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/cndb_internal.h b/lib/cn/cndb_internal.h
@@ -699,6 +699,6 @@ cndb_record_unpack(u32 cndb_version, struct cndb_hdr_omf *buf, union cndb_mtu **
 #define CNDB_LOGTX(err, cndb, txid, primark, fmt, ...) \
     CNDB_LOG(err, cndb, primark, "tx %lu" fmt, (ulong)txid, ##__VA_ARGS__)
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "cndb_internal_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/csched.c b/lib/cn/csched.c
@@ -118,6 +118,6 @@ csched_compact_status_get(struct csched *handle, struct hse_kvdb_compact_status
         cs->cs_compact_status_get(cs, status);
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/csched_noop.c b/lib/cn/csched_noop.c
@@ -83,6 +83,6 @@ sp_noop_create(
     return 0;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_noop_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/csched_noop.h b/lib/cn/csched_noop.h
@@ -27,8 +27,8 @@ struct noop_node {
 struct noop_tree {
 };
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_noop_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/csched_sp3.c b/lib/cn/csched_sp3.c
@@ -2456,6 +2456,6 @@ sp3_create(
     return err;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_sp3_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/csched_sp3.h b/lib/cn/csched_sp3.h
@@ -47,8 +47,8 @@ struct sp3_tree {
     atomic64_t       spt_ingest_wlen;
 };
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_sp3_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/csched_sp3_work.c b/lib/cn/csched_sp3_work.c
@@ -834,6 +834,6 @@ sp3_work(
     return 0;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_sp3_work_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/csched_sp3_work.h b/lib/cn/csched_sp3_work.h
@@ -84,8 +84,8 @@ sp3_work(
      (SP3_QTHREADS_LEAFBIG << (8 * SP3_QNUM_LEAFBIG)) |                                            \
      (SP3_QTHREADS_LSCAT << (8 * SP3_QNUM_LSCAT)) | (SP3_QTHREADS_SHARED << (8 * SP3_NUM_QUEUES)))
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "csched_sp3_work_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/kblock_builder.c b/lib/cn/kblock_builder.c
@@ -1248,6 +1248,6 @@ kbb_set_merge_stats(struct kblock_builder *bld, struct cn_merge_stats *stats)
     bld->mstats = stats;
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "kblock_builder_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/kblock_builder.h b/lib/cn/kblock_builder.h
@@ -143,8 +143,8 @@ kbb_get_agegroup(struct kblock_builder *bld);
 void
 kbb_set_merge_stats(struct kblock_builder *bld, struct cn_merge_stats *stats);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "kblock_builder_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/kcompact.c b/lib/cn/kcompact.c
@@ -15,9 +15,9 @@
 
 #define MTF_MOCK_IMPL_kcompact
 #include "kcompact.h"
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "kcompact_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #include "kvset.h"
 #include "cn_metrics.h"

diff --git a/lib/cn/kcompact.h b/lib/cn/kcompact.h
@@ -64,8 +64,8 @@ struct kvset_vblk_map {
 merr_t
 cn_kcompact(struct cn_compaction_work *w);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "kcompact_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif
diff --git a/lib/cn/kvset.c b/lib/cn/kvset.c
@@ -3821,7 +3821,7 @@ kvset_fini(void)
     kmem_cache_destroy(kvset_iter_cache);
 }
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "kvset_ut_impl.i"
 #include "kvset_view_ut_impl.i"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
diff --git a/lib/cn/kvset.h b/lib/cn/kvset.h
@@ -561,8 +561,8 @@ kvset_iter_next_val_direct(
     uint                vlen,
     uint                bufsz);
 
-#if defined(HSE_UNIT_TEST_MODE) && HSE_UNIT_TEST_MODE == 1
+#if HSE_MOCKING
 #include "kvset_ut.h"
-#endif /* HSE_UNIT_TEST_MODE */
+#endif /* HSE_MOCKING */
 
 #endif