Skip to content

Commit 47a5eaf

Browse files
trondndaverigby
authored andcommitted
Refactor: move mc_time_test.cc next to mc_time.cc
To make it easier to locate the unit test for the class. Run as part of memcached_unit_tests to avoid having to link and start two binaries for a handfull of tests Change-Id: I65164ed1da1ab214209bdb0e0cb931dc109df648 Reviewed-on: http://review.couchbase.org/c/kv_engine/+/135603 Reviewed-by: James Harrison <[email protected]> Tested-by: Trond Norbye <[email protected]>
1 parent 494f768 commit 47a5eaf

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

daemon/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,8 @@ if (COUCHBASE_KV_BUILD_UNIT_TESTS)
269269
add_sanitizers(client_cert_config_test)
270270

271271
add_executable(memcached_unit_tests
272-
connection_unit_tests.cc)
272+
connection_unit_tests.cc
273+
mc_time_test.cc)
273274
add_sanitizers(memcached_unit_tests)
274275
target_link_libraries(memcached_unit_tests
275276
memcached_daemon

tests/mc_time/mc_time_test.cc renamed to daemon/mc_time_test.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
* See the License for the specific language governing permissions and
1515
* limitations under the License.
1616
*/
17-
#include <daemon/executor.h>
18-
#include <daemon/executorpool.h>
19-
#include <daemon/mc_time.h>
20-
#include <daemon/memcached.h>
17+
#include "executor.h"
18+
#include "executorpool.h"
19+
#include "mc_time.h"
20+
#include "memcached.h"
2121
#include <folly/portability/GTest.h>
2222
#include <gsl/gsl>
2323
#include <memory>

tests/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ADD_SUBDIRECTORY(error_map_sanity_check)
99
ADD_SUBDIRECTORY(executor)
1010
ADD_SUBDIRECTORY(function_chain)
1111
ADD_SUBDIRECTORY(histograms)
12-
ADD_SUBDIRECTORY(mc_time)
1312
ADD_SUBDIRECTORY(mcbp)
1413
ADD_SUBDIRECTORY(memory_tracking_test)
1514
ADD_SUBDIRECTORY(scripts_tests)

tests/mc_time/CMakeLists.txt

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)