From efb0a169889f07904fe80e79f914e9228c268ed2 Mon Sep 17 00:00:00 2001 From: Kaveh Vahedipour Date: Fri, 26 Feb 2016 09:33:05 +0100 Subject: [PATCH 1/4] Unit tests only in maintainer mode --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f685ae9ed..7ecc2a0f41 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,5 +569,7 @@ add_dependencies(arangodump zlibstatic v8_build) add_dependencies(arangoimp zlibstatic v8_build) add_dependencies(arangorestore zlibstatic v8_build) add_dependencies(arangosh zlibstatic v8_build) -add_dependencies(basics_suite v8_build) -add_dependencies(geo_suite v8_build) +if (USE_MAINATINER_MODE) + add_dependencies(basics_suite v8_build) + add_dependencies(geo_suite v8_build) +endif() From 421df55e892a346bce0c43a4a3bb825c22af5e80 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Fri, 26 Feb 2016 09:34:56 +0100 Subject: [PATCH 2/4] fixed tests --- CMakeLists.txt | 5 +++-- etc/relative/arangod.conf | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ecc2a0f41..446128d6af 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -569,7 +569,8 @@ add_dependencies(arangodump zlibstatic v8_build) add_dependencies(arangoimp zlibstatic v8_build) add_dependencies(arangorestore zlibstatic v8_build) add_dependencies(arangosh zlibstatic v8_build) -if (USE_MAINATINER_MODE) + +if (USE_BOOST_UNITTESTS) add_dependencies(basics_suite v8_build) add_dependencies(geo_suite v8_build) -endif() +endif () diff --git a/etc/relative/arangod.conf b/etc/relative/arangod.conf index 70bbfee7fd..0fb08d09aa 100644 --- a/etc/relative/arangod.conf +++ b/etc/relative/arangod.conf @@ -5,7 +5,7 @@ [server] disable-authentication = true endpoint = tcp://0.0.0.0:8529 -threads = 4 +threads = 8 # reuse-address = false [scheduler] From 7c2979275df0e9183035ddf8363988f86aa95404 Mon Sep 17 00:00:00 2001 From: Max Neunhoeffer Date: Fri, 26 Feb 2016 08:53:59 +0000 Subject: [PATCH 3/4] Fix a defined around SSL. --- lib/Rest/Version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Rest/Version.cpp b/lib/Rest/Version.cpp index 67cc315abe..8babc0d5ea 100644 --- a/lib/Rest/Version.cpp +++ b/lib/Rest/Version.cpp @@ -154,7 +154,7 @@ std::string Version::getV8Version() { std::string Version::getOpenSSLVersion() { #ifdef OPENSSL_VERSION_TEXT return std::string(OPENSSL_VERSION_TEXT); -#elif ARANGODB_OPENSSL_VERSION +#elif defined(ARANGODB_OPENSSL_VERSION) return std::string(ARANGODB_OPENSSL_VERSION); #else return std::string(""); From 5cc24bd7d9a35240ed710def5a77fba5c3592bf6 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Fri, 26 Feb 2016 09:54:12 +0100 Subject: [PATCH 4/4] Reverted changement of thread number --- etc/relative/arangod.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/relative/arangod.conf b/etc/relative/arangod.conf index 0fb08d09aa..70bbfee7fd 100644 --- a/etc/relative/arangod.conf +++ b/etc/relative/arangod.conf @@ -5,7 +5,7 @@ [server] disable-authentication = true endpoint = tcp://0.0.0.0:8529 -threads = 8 +threads = 4 # reuse-address = false [scheduler]