From 2f72b43adbc5cc3b910f5d7173dfd0ca431f78e7 Mon Sep 17 00:00:00 2001
From: Roman Tsisyk <roman@tsisyk.com>
Date: Wed, 13 Nov 2013 15:21:10 +0400
Subject: [PATCH] Disable connector_c, tarancheck and tarantar for 1.6
---
CMakeLists.txt | 7 +++++--
test/CMakeLists.txt | 3 ++-
test/connector_c/{suite.ini => suite.ini.disabled} | 0
3 files changed, 7 insertions(+), 3 deletions(-)
rename test/connector_c/{suite.ini => suite.ini.disabled} (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9add00650e..82c1818be9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,7 +37,9 @@ find_program(POD2MAN pod2man)
#
set (TARANTOOL_PRODUCT "box")
set (TARANTOOL_MODULES "box")
-set (TARANTOOL_CLIENTS "tarancheck" "tarantar")
+# Disable tarancheck and tarantar for 1.6
+# set (TARANTOOL_CLIENTS "tarancheck" "tarantar")
+set (TARANTOOL_CLIENTS "")
# Define PACKAGE macro in tarantool/config.h
set (PACKAGE "Tarantool")
@@ -345,7 +347,8 @@ include (cmake/package.cmake)
include (cmake/rpm.cmake)
add_subdirectory(cfg)
-add_subdirectory(connector)
+# Disable connector_c for 1.6
+# add_subdirectory(connector)
add_subdirectory(src)
add_subdirectory(extra)
add_subdirectory(client)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4e9ff5dce2..e5448aae0c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,8 @@ add_custom_target(test-force
COMMAND ${PROJECT_SOURCE_DIR}/test/test-run.py --builddir=${PROJECT_BINARY_DIR} --force --vardir=${PROJECT_BINARY_DIR}/test/var)
add_subdirectory(unit)
-add_subdirectory(connector_c)
+# Disable connector_c for 1.6
+#add_subdirectory(connector_c)
macro(install_cfg type_cfg dest)
install (FILES ${CMAKE_SOURCE_DIR}/test/share/tarantool_${type_cfg}.cfg
diff --git a/test/connector_c/suite.ini b/test/connector_c/suite.ini.disabled
similarity index 100%
rename from test/connector_c/suite.ini
rename to test/connector_c/suite.ini.disabled
--
GitLab