diff options
| author | Sage Weil <sage@redhat.com> | 2018-01-10 23:43:04 +0100 |
|---|---|---|
| committer | Sage Weil <sage@redhat.com> | 2018-03-06 21:44:49 +0100 |
| commit | 6eb8f30a238f8a0a546ddbab3536ff08d158155e (patch) | |
| tree | 626c2dcb04f949fb6ac7cacf06b6ee6d3d04f783 /src/test/TestTimers.cc | |
| parent | unittest_daemon_config: add needed rm_val() (diff) | |
| download | ceph-6eb8f30a238f8a0a546ddbab3536ff08d158155e.tar.xz ceph-6eb8f30a238f8a0a546ddbab3536ff08d158155e.zip | |
test: CINIT_FLAG_NO_MON_CONFIG or NO_DEFAULT_CONFIG_FILE
Usually we use NO_DEFAULT_CONFIG_FILE, but for those tests that need the
plugin directory overrides in order to work properly when run manually
(e.g., "bin/unittest_compression"), read the config and only skip the
mon config.
The NO_DFEAULT_CONFIG_FILE (which also skips the mon) would work for
everything when run via ctest, but as a dev one often runs the unittest
manually and having to pass CEPH_LIB=lib is annoying. Note that
do_cmake.sh already writes out a trivial ceph.conf with these options
set for us.
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to 'src/test/TestTimers.cc')
| -rw-r--r-- | src/test/TestTimers.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/TestTimers.cc b/src/test/TestTimers.cc index edf4efc9c54..cf6ef4b5e79 100644 --- a/src/test/TestTimers.cc +++ b/src/test/TestTimers.cc @@ -255,7 +255,8 @@ int main(int argc, const char **argv) argv_to_vec(argc, argv, args); auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, - CODE_ENVIRONMENT_UTILITY, 0); + CODE_ENVIRONMENT_UTILITY, + CINIT_FLAG_NO_DEFAULT_CONFIG_FILE); common_init_finish(g_ceph_context); int ret; |