From d5ed42be0d28b7ee16d02142e868adf52e39c714 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja@tarantool.org>
Date: Tue, 3 Sep 2013 01:32:53 +0400
Subject: [PATCH] Fix broken 'make install' target.
The bootstrap snap (000000000000000001.snap) moved to src/.
It was removed from test/box/. Fix the install target,
add a RENAME option to correctly install the file.
---
test/CMakeLists.txt | 10 ++++++----
test/share/tarantool.cfg | 9 ---------
test/share/tarantool_rpm.cfg | 9 ---------
test/share/tarantool_tgz.cfg | 10 ----------
4 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f26d79ce51..4c1cdcde7e 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 dd1f4c5e5f..bdd03f06cb 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 16d65fd0d0..36ee1a9c30 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 adfc7d35b6..4422ee9069 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"
--
GitLab