Skip to content

Commit dd1329b

Browse files
ligurioBuristan
authored andcommitted
cmake: define test parameter delimiter
The patch defines a delimiter symbol that splits title and parameters in a test title and replaces delimiter symbol in Lua fuzzing tests. Needed for the following commit. Follows up commit 0bced96 ("cmake: support Lua fuzzing tests by CTest"). NO_CHANGELOG=testing NO_DOC=testing NO_TEST=testing
1 parent 0dada75 commit dd1329b

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

test/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ list(APPEND CTEST_FAIL_REGEXP
5151

5252
string(RANDOM LENGTH 9 ALPHABET 0123456789 RANDOM_SEED)
5353
message(STATUS "Random seed is ${RANDOM_SEED}")
54+
set(TEST_PARAM_DELIM ":")
5455

5556
list(APPEND LUATEST_COMMAND_WITH_FLAGS
5657
${PROJECT_SOURCE_DIR}/test-run/lib/luatest/bin/luatest

test/fuzz/lua/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,23 +18,23 @@ list(APPEND TEST_ENGINE_FLAGS
1818
--seed ${RANDOM_SEED}
1919
--verbose
2020
)
21-
add_test(NAME ${test_path}/test_engine.lua-memtx
21+
add_test(NAME ${test_path}/test_engine.lua${TEST_PARAM_DELIM}memtx
2222
COMMAND ${TARANTOOL_BIN}
2323
${CMAKE_CURRENT_SOURCE_DIR}/test_engine.lua
2424
${TEST_ENGINE_FLAGS}
2525
--test_dir ${CMAKE_CURRENT_BINARY_DIR}/test_engine-memtx
2626
--engine memtx
2727
)
28-
add_test(NAME ${test_path}/test_engine.lua-vinyl
28+
add_test(NAME ${test_path}/test_engine.lua${TEST_PARAM_DELIM}vinyl
2929
COMMAND ${TARANTOOL_BIN}
3030
${CMAKE_CURRENT_SOURCE_DIR}/test_engine.lua
3131
${TEST_ENGINE_FLAGS}
3232
--test_dir ${CMAKE_CURRENT_BINARY_DIR}/test_engine-vinyl
3333
--engine vinyl
3434
)
3535
set_tests_properties(
36-
${test_path}/test_engine.lua-vinyl
37-
${test_path}/test_engine.lua-memtx
36+
${test_path}/test_engine.lua${TEST_PARAM_DELIM}vinyl
37+
${test_path}/test_engine.lua${TEST_PARAM_DELIM}memtx
3838
PROPERTIES
3939
ENVIRONMENT "LUA_PATH=${LUA_PATH}"
4040
LABELS "${TEST_SUITE_NAME};fuzzing;"

0 commit comments

Comments
 (0)