diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f26d79ce513d03bd31ddd19f8acabcdfdfd5ac93..4c1cdcde7e34d46543922e3c8aa124697059b066 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -16,12 +16,14 @@ if (ENABLE_RPM) install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_rpm.cfg DESTINATION ${CMAKE_SYSCONF_DIR}/tarantool/ RENAME "tarantool.cfg") - install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap - DESTINATION share/tarantool) + install (FILES ${CMAKE_SOURCE_DIR}/src/bootstrap.snap + DESTINATION share/tarantool + RENAME 00000000000000000001.snap) else() install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_tgz.cfg DESTINATION "${CMAKE_SYSCONF_DIR}" RENAME "tarantool.cfg") - install (FILES ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap - DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool") + install (FILES ${CMAKE_SOURCE_DIR}/src/bootstrap.snap + DESTINATION "${CMAKE_LOCALSTATE_DIR}/lib/tarantool" + RENAME 00000000000000000001.snap) endif() diff --git a/test/share/tarantool.cfg b/test/share/tarantool.cfg index dd1f4c5e5f052aa050f8b4d636ae374bf50b2292..bdd03f06cb38e575c6275b736062950539476cb7 100644 --- a/test/share/tarantool.cfg +++ b/test/share/tarantool.cfg @@ -34,12 +34,3 @@ admin_port = 33015 # When the limit is reached, Tarantool closes # the WAL and starts a new one. rows_per_wal = 50000 - -# -# Define a simple space with 1 HASH-based -# primary key. -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" diff --git a/test/share/tarantool_rpm.cfg b/test/share/tarantool_rpm.cfg index 16d65fd0d0249c5f753df4447317957c5ff7f59e..36ee1a9c30d9c7cf32b977450eefc0cca3ada79a 100644 --- a/test/share/tarantool_rpm.cfg +++ b/test/share/tarantool_rpm.cfg @@ -31,12 +31,3 @@ admin_port = 33015 # When the limit is reached, Tarantool closes # the WAL and starts a new one. rows_per_wal = 50000 - -# -# Define a simple space with 1 HASH-based -# primary key. -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" diff --git a/test/share/tarantool_tgz.cfg b/test/share/tarantool_tgz.cfg index adfc7d35b6cf41e231153bcabb960b062fdde6d4..4422ee906966bd11e3ea1bdc4d6b2516fc5b1088 100644 --- a/test/share/tarantool_tgz.cfg +++ b/test/share/tarantool_tgz.cfg @@ -35,15 +35,5 @@ admin_port = 33015 # the WAL and starts a new one. rows_per_wal = 50000 -# -# Define a simple space with 1 HASH-based -# primary key. -space[0].enabled = 1 -space[0].index[0].type = "HASH" -space[0].index[0].unique = 1 -space[0].index[0].key_field[0].fieldno = 0 -space[0].index[0].key_field[0].type = "NUM" - -# # working directory (daemon will chdir(2) to it) work_dir = "var/lib/tarantool"