From 412e7a0f939e0f50082b89d2f494d1cbe88620d8 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Thu, 25 Aug 2011 18:28:07 +0400
Subject: [PATCH] Fix compilation and test failures in
-DCMAKE_BUILD_TYPE=RelWithDebugInfo
---
CMakeLists.txt | 3 ++-
connector/c/CMakeLists.txt | 5 ++++-
test/CMakeLists.txt | 4 ++--
test/box/configuration.result | 13 ++++++------
test/box/show.result | 26 +++++++++++------------
test/box/stat.result | 26 +++++++++++------------
test/box_memcached/multiversioning.result | 3 +--
7 files changed, 39 insertions(+), 41 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d1bf192c64..c025ea65ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,6 +12,7 @@ find_program(CAT cat)
find_program(GIT git)
find_program(RAGEL ragel)
find_program(CONFETTI confetti)
+find_program(LD ld)
set(luadir ${PROJECT_BINARY_DIR}/third_party/luajit/src)
link_directories(${luadir})
@@ -119,7 +120,7 @@ execute_process (COMMAND ${GIT} describe HEAD
#
set (CPACK_PACKAGE_VERSION_MAJOR "1")
set (CPACK_PACKAGE_VERSION_MINOR "4")
-set (CPACK_PACKAGE_VERSION_PATCH "1")
+set (CPACK_PACKAGE_VERSION_PATCH "2")
if (TARANTOOL_VERSION STREQUAL "")
set (TARANTOOL_VERSION
"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
diff --git a/connector/c/CMakeLists.txt b/connector/c/CMakeLists.txt
index d5bd9b7d45..4e27db2590 100644
--- a/connector/c/CMakeLists.txt
+++ b/connector/c/CMakeLists.txt
@@ -15,7 +15,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
set (tnt_cflags "${tnt_cflags} -Werror")
endif()
-
#============================================================================#
# Build tnt projects
#============================================================================#
@@ -45,6 +44,10 @@ set (tnt_sources
# Builds
#----------------------------------------------------------------------------#
+# Here we manage to build static/dynamic libraries ourselves,
+# do not use the top level settings.
+string(REPLACE "-static" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
+
#
# Static library
#
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5834c41b5c..15bb5c2e83 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,6 +7,6 @@ tarantool_client("box/connector" ${CMAKE_SOURCE_DIR}/test/box/connector.c)
install (PROGRAMS tarantool DESTINATION bin)
install (DIRECTORY lib DESTINATION bin)
-install (FILES ${CMAKE_SOURCE_DIR}/box/tarantool.cfg
- ${CMAKE_SOURCE_DIR}/box/00000000000000000001.snap
+install (FILES ${CMAKE_SOURCE_DIR}/test/box/tarantool.cfg
+ ${CMAKE_SOURCE_DIR}/test/box/00000000000000000001.snap
DESTINATION bin)
diff --git a/test/box/configuration.result b/test/box/configuration.result
index bb9285d114..42375c7c1b 100644
--- a/test/box/configuration.result
+++ b/test/box/configuration.result
@@ -7,11 +7,10 @@
show stat
---
statistics:
- REPLACE: { rps: 0 , total: 0 }
- SELECT_LIMIT: { rps: 0 , total: 0 }
- SELECT: { rps: 0 , total: 0 }
- UPDATE_FIELDS: { rps: 0 , total: 0 }
- DELETE_1_3: { rps: 0 , total: 0 }
- DELETE: { rps: 0 , total: 0 }
- CALL: { rps: 0 , total: 0 }
+ REPLACE: { rps: 0 , total: 0 }
+ SELECT: { rps: 0 , total: 0 }
+ UPDATE: { rps: 0 , total: 0 }
+ DELETE_1_3: { rps: 0 , total: 0 }
+ DELETE: { rps: 0 , total: 0 }
+ CALL: { rps: 0 , total: 0 }
...
diff --git a/test/box/show.result b/test/box/show.result
index cc694121a6..8ada7a0ec0 100644
--- a/test/box/show.result
+++ b/test/box/show.result
@@ -1,13 +1,12 @@
show stat
---
statistics:
- REPLACE: { rps: 0 , total: 0 }
- SELECT_LIMIT: { rps: 0 , total: 0 }
- SELECT: { rps: 0 , total: 0 }
- UPDATE_FIELDS: { rps: 0 , total: 0 }
- DELETE_1_3: { rps: 0 , total: 0 }
- DELETE: { rps: 0 , total: 0 }
- CALL: { rps: 0 , total: 0 }
+ REPLACE: { rps: 0 , total: 0 }
+ SELECT: { rps: 0 , total: 0 }
+ UPDATE: { rps: 0 , total: 0 }
+ DELETE_1_3: { rps: 0 , total: 0 }
+ DELETE: { rps: 0 , total: 0 }
+ CALL: { rps: 0 , total: 0 }
...
help
---
@@ -75,13 +74,12 @@ configuration:
show stat
---
statistics:
- REPLACE: { rps: 0 , total: 0 }
- SELECT_LIMIT: { rps: 0 , total: 0 }
- SELECT: { rps: 0 , total: 0 }
- UPDATE_FIELDS: { rps: 0 , total: 0 }
- DELETE_1_3: { rps: 0 , total: 0 }
- DELETE: { rps: 0 , total: 0 }
- CALL: { rps: 0 , total: 0 }
+ REPLACE: { rps: 0 , total: 0 }
+ SELECT: { rps: 0 , total: 0 }
+ UPDATE: { rps: 0 , total: 0 }
+ DELETE_1_3: { rps: 0 , total: 0 }
+ DELETE: { rps: 0 , total: 0 }
+ CALL: { rps: 0 , total: 0 }
...
save coredump
---
diff --git a/test/box/stat.result b/test/box/stat.result
index b5e4fba5d6..37f80dd388 100644
--- a/test/box/stat.result
+++ b/test/box/stat.result
@@ -26,13 +26,12 @@ Insert OK, 1 row affected
show stat
---
statistics:
- REPLACE: { rps: 2 , total: 10 }
- SELECT_LIMIT: { rps: 0 , total: 0 }
- SELECT: { rps: 0 , total: 0 }
- UPDATE_FIELDS: { rps: 0 , total: 0 }
- DELETE_1_3: { rps: 0 , total: 0 }
- DELETE: { rps: 0 , total: 0 }
- CALL: { rps: 0 , total: 0 }
+ REPLACE: { rps: 2 , total: 10 }
+ SELECT: { rps: 0 , total: 0 }
+ UPDATE: { rps: 0 , total: 0 }
+ DELETE_1_3: { rps: 0 , total: 0 }
+ DELETE: { rps: 0 , total: 0 }
+ CALL: { rps: 0 , total: 0 }
...
#
# restart server
@@ -45,13 +44,12 @@ statistics:
show stat
---
statistics:
- REPLACE: { rps: 0 , total: 0 }
- SELECT_LIMIT: { rps: 0 , total: 0 }
- SELECT: { rps: 0 , total: 0 }
- UPDATE_FIELDS: { rps: 0 , total: 0 }
- DELETE_1_3: { rps: 0 , total: 0 }
- DELETE: { rps: 0 , total: 0 }
- CALL: { rps: 0 , total: 0 }
+ REPLACE: { rps: 0 , total: 0 }
+ SELECT: { rps: 0 , total: 0 }
+ UPDATE: { rps: 0 , total: 0 }
+ DELETE_1_3: { rps: 0 , total: 0 }
+ DELETE: { rps: 0 , total: 0 }
+ CALL: { rps: 0 , total: 0 }
...
delete from t0 where k0 = 0
Delete OK, 1 row affected
diff --git a/test/box_memcached/multiversioning.result b/test/box_memcached/multiversioning.result
index aff3b8628c..390a361424 100644
--- a/test/box_memcached/multiversioning.result
+++ b/test/box_memcached/multiversioning.result
@@ -19,9 +19,8 @@ show stat
---
statistics:
REPLACE: { rps: 0 , total: 0 }
- SELECT_LIMIT: { rps: 0 , total: 0 }
SELECT: { rps: 0 , total: 0 }
- UPDATE_FIELDS: { rps: 0 , total: 0 }
+ UPDATE: { rps: 0 , total: 0 }
DELETE_1_3: { rps: 0 , total: 0 }
DELETE: { rps: 0 , total: 0 }
CALL: { rps: 0 , total: 0 }
--
GitLab