From 5bf0a7af5f48da869cef5d6cfa2a5b78a4a15a31 Mon Sep 17 00:00:00 2001
From: Konstantin Osipov <kostja.osipov@gmail.com>
Date: Tue, 14 Feb 2012 00:44:26 +0400
Subject: [PATCH] Error injection: another round of review fixes.
---
CMakeLists.txt | 6 +++---
core/tarantool.m | 2 +-
include/config.h.cmake | 2 +-
test/box/args.result | 4 ++--
test/box/args.test | 2 +-
test/lib/server.py | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cee5899a2c..941c894750 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -247,7 +247,7 @@ set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_STATIC=${ENABLE_STATIC} -DE
set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_TRACE=${ENABLE_TRACE} -DENABLE_BACKTRACE=${ENABLE_BACKTRACE}")
set(TARANTOOL_OPTIONS "${TARANTOOL_OPTIONS} -DENABLE_CLIENT=${ENABLE_CLIENT}")
-set(TARANTOOL_BUILD "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR} <${CMAKE_BUILD_TYPE}>")
+set(TARANTOOL_BUILD "${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}-${CMAKE_BUILD_TYPE}")
#
# Output compile-time defines into config.h. Do it at the end
@@ -263,7 +263,7 @@ configure_file(
)
message (STATUS "")
-message (STATUS "Tarantool configuration:")
+message (STATUS "Tarantool configuration is complete:")
message (STATUS "")
message (STATUS "VERSION: ${TARANTOOL_VERSION}")
message (STATUS "BUILD: ${TARANTOOL_BUILD}")
@@ -276,6 +276,6 @@ message (STATUS "ENABLE_TRACE: ${ENABLE_TRACE}")
message (STATUS "ENABLE_BACKTRACE: ${ENABLE_BACKTRACE} (symbol resolve: ${HAVE_BFD})")
message (STATUS "ENABLE_CLIENT: ${ENABLE_CLIENT}")
message (STATUS "")
-message (STATUS "(Please check out CMakeCache.txt to view or modify configuration results)")
+message (STATUS "To view or modify configuration results, check out CMakeCache.txt.")
message (STATUS "")
diff --git a/core/tarantool.m b/core/tarantool.m
index fb5700cc55..cb7e859c30 100644
--- a/core/tarantool.m
+++ b/core/tarantool.m
@@ -450,7 +450,7 @@ main(int argc, char **argv)
if (gopt(opt, 'V')) {
printf("Tarantool/%s %s\n", mod_name, tarantool_version());
printf("Target: %s\n", BUILD_INFO);
- printf("Build with: %s\n", BUILD_WITH);
+ printf("Build options: %s\n", BUILD_OPTIONS);
printf("CFLAGS:%s\n", BUILD_CFLAGS);
return 0;
}
diff --git a/include/config.h.cmake b/include/config.h.cmake
index e3d10bb5f4..62fd1545e7 100644
--- a/include/config.h.cmake
+++ b/include/config.h.cmake
@@ -55,7 +55,7 @@
#define BUILD_TYPE "@CMAKE_BUILD_TYPE@"
#define BUILD_INFO "@TARANTOOL_BUILD@"
#define BUILD_CFLAGS "@CMAKE_C_FLAGS@ @core_cflags@"
-#define BUILD_WITH "cmake . @TARANTOOL_OPTIONS@"
+#define BUILD_OPTIONS "cmake . @TARANTOOL_OPTIONS@"
/*
* vim: syntax=c
*/
diff --git a/test/box/args.result b/test/box/args.result
index 49b40e1a28..ec0dfb72bd 100644
--- a/test/box/args.result
+++ b/test/box/args.result
@@ -76,13 +76,13 @@ tarantool_box: --background requires 'logger' configuration option to be set
tarantool_box --version
Tarantool/Box 1.minor.patch-<rev>-<commit>
Target: platform <build>
-Build with: flags
+Build options: flags
CFLAGS: flags
tarantool_box -V
Tarantool/Box 1.minor.patch-<rev>-<commit>
Target: platform <build>
-Build with: flags
+Build options: flags
CFLAGS: flags
#
diff --git a/test/box/args.test b/test/box/args.test
index 3647ac59bb..9246754d2a 100644
--- a/test/box/args.test
+++ b/test/box/args.test
@@ -28,7 +28,7 @@ os.unlink(cfg)
sys.stdout.pop_filter()
sys.stdout.push_filter("(\d)\.\d\.\d(-\d+-\w+)?", "\\1.minor.patch-<rev>-<commit>")
sys.stdout.push_filter("Target: .*", "Target: platform <build>")
-sys.stdout.push_filter("Build with: .*", "Build with: flags")
+sys.stdout.push_filter("Build options: .*", "Build options: flags")
sys.stdout.push_filter("CFLAGS: .*", "CFLAGS: flags")
server.test_option("--version")
diff --git a/test/lib/server.py b/test/lib/server.py
index 95b68ea47f..ae5deb3b54 100644
--- a/test/lib/server.py
+++ b/test/lib/server.py
@@ -266,7 +266,7 @@ class Server(object):
def test_debug(self):
output = self.test_option_get(False, "-V")
- if re.search("<Debug>", output):
+ if re.search("-Debug", output):
return True
return False
--
GitLab