Skip to content

Commit 424c7fb

Browse files
committed
Rationalize ep-engine testsuite names
The CTest test names don't match the executable names for the ep_testsuite_* series of tests. This can be confusing, and complicates test management, particulary as we are about to add a third variant (ephemeral) to the tests. Rationalise the test names, so they are simply <suite_name>.<variant> Examples: $ ctest -N -R ep_testsuite Test project /Users/dave/repos/couchbase/server/source/build/ep-engine Test #18: ep_testsuite.value_eviction Test #19: ep_testsuite.full_eviction Test #20: ep_testsuite_basic.value_eviction Test #21: ep_testsuite_basic.full_eviction Test #22: ep_testsuite_dcp.value_eviction Test #23: ep_testsuite_dcp.full_eviction Test #24: ep_testsuite_tap.value_eviction Test #25: ep_testsuite_tap.full_eviction Test #26: ep_testsuite_checkpoint.value_eviction Test #27: ep_testsuite_checkpoint.full_eviction Test #28: ep_testsuite_xdcr.value_eviction Test #29: ep_testsuite_xdcr.full_eviction Change-Id: I227b669497ad2c8114d631f331cf77180774ae30 Reviewed-on: http://review.couchbase.org/70611 Tested-by: buildbot <[email protected]> Reviewed-by: Jim Walker <[email protected]>
1 parent 7798c94 commit 424c7fb

File tree

1 file changed

+18
-28
lines changed

1 file changed

+18
-28
lines changed

CMakeLists.txt

+18-28
Original file line numberDiff line numberDiff line change
@@ -560,40 +560,30 @@ INSTALL(TARGETS ep
560560

561561

562562
# Defines a testsuite which runs in full and value eviction variants.
563-
FUNCTION(ADD_TESTSUITE value_evict_name full_evict_name testsuite_so timeout)
563+
FUNCTION(ADD_TESTSUITE name timeout)
564564
SET(_cmdline
565-
${CMAKE_BINARY_DIR}/memcached/engine_testapp -E ${CMAKE_CURRENT_BINARY_DIR}/ep.so -T ${testsuite_so})
566-
ADD_TEST(NAME ${value_evict_name}
567-
COMMAND ${_cmdline} -v -e "dbname=./${value_evict_name}")
568-
ADD_TEST(NAME ${full_evict_name}
569-
COMMAND ${_cmdline} -v -e "item_eviction_policy=full_eviction$<SEMICOLON>dbname=./${full_evict_name}")
570-
SET_TESTS_PROPERTIES(${value_evict_name} PROPERTIES TIMEOUT ${timeout})
571-
SET_TESTS_PROPERTIES(${full_evict_name} PROPERTIES TIMEOUT ${timeout})
565+
${CMAKE_BINARY_DIR}/memcached/engine_testapp
566+
-E ${CMAKE_CURRENT_BINARY_DIR}/ep.so
567+
-T ${CMAKE_CURRENT_BINARY_DIR}/${name}.so)
568+
ADD_TEST(NAME ${name}.value_eviction
569+
COMMAND ${_cmdline} -v -e "dbname=./${name}.value_eviction.db")
570+
ADD_TEST(NAME ${name}.full_eviction
571+
COMMAND ${_cmdline} -v -e "item_eviction_policy=full_eviction$<SEMICOLON>dbname=./${name}.full_eviction.db")
572+
SET_TESTS_PROPERTIES(${name}.value_eviction PROPERTIES TIMEOUT ${timeout})
573+
SET_TESTS_PROPERTIES(${name}.full_eviction PROPERTIES TIMEOUT ${timeout})
572574
ENDFUNCTION()
573575

574-
ADD_TESTSUITE(ep-engine_engine_tests ep-engine_full_eviction_tests
575-
${CMAKE_CURRENT_BINARY_DIR}/ep_testsuite.so
576-
1800)
576+
ADD_TESTSUITE(ep_testsuite 1800)
577577

578-
ADD_TESTSUITE(ep-engine_basic_tests ep-engine_full_eviction_basic
579-
${CMAKE_CURRENT_BINARY_DIR}/ep_testsuite_basic.so
580-
600)
578+
ADD_TESTSUITE(ep_testsuite_basic 600)
581579

582-
ADD_TESTSUITE(ep-engine_dcp_tests ep-engine_full_eviction_dcp
583-
${CMAKE_CURRENT_BINARY_DIR}/ep_testsuite_dcp.so
584-
1200)
580+
ADD_TESTSUITE(ep_testsuite_dcp 1200)
585581

586-
ADD_TESTSUITE(ep-engine_value_eviction_tap ep-engine_full_eviction_tap
587-
${CMAKE_CURRENT_BINARY_DIR}/ep_testsuite_tap.so
588-
180)
582+
ADD_TESTSUITE(ep_testsuite_tap 180)
589583

590-
ADD_TESTSUITE(ep-engine_value_eviction_checkpoint ep-engine_full_eviction_checkpoint
591-
${CMAKE_CURRENT_BINARY_DIR}/ep_testsuite_checkpoint.so
592-
120)
584+
ADD_TESTSUITE(ep_testsuite_checkpoint 120)
593585

594-
ADD_TESTSUITE(ep-engine_value_eviction_xdcr ep-engine_full_eviction_xdcr
595-
${CMAKE_CURRENT_BINARY_DIR}/ep_testsuite_xdcr.so
596-
120)
586+
ADD_TESTSUITE(ep_testsuite_xdcr 120)
597587

598588
# ================================ PERF_TESTS ================================ #
599589
SET(_ep_perfsuite_cmdline ${CMAKE_BINARY_DIR}/memcached/engine_testapp -E ${CMAKE_CURRENT_BINARY_DIR}/ep.so -T ${CMAKE_CURRENT_BINARY_DIR}/ep_perfsuite.so -v)
@@ -606,8 +596,8 @@ ADD_CUSTOM_TARGET(test-perfsuite
606596
ep
607597
ep_perfsuite
608598
VERBATIM)
609-
ADD_TEST(NAME ep-engine_perfsuite
610-
COMMAND ${_ep_perfsuite_cmdline} -e "dbname=./value_eviction_perf")
599+
ADD_TEST(NAME ep_perfsuite.value_eviction
600+
COMMAND ${_ep_perfsuite_cmdline} -e "dbname=./ep_perfsuite.value_eviction.db")
611601

612602
# ============================================================================ #
613603

0 commit comments

Comments
 (0)