Merge pull request #6726 from symless/pr-5943-disable-tests

Disable test with cmake option

CMakeLists.txt

@@ -20,6 +20,7 @@ project (synergy-core C CXX)
 option (SYNERGY_BUILD_LEGACY_GUI "Build the legacy GUI" ON)
 option (SYNERGY_BUILD_LEGACY_SERVICE "Build the legacy service (synergyd)" ON)
 option (SYNERGY_BUILD_LEGACY_INSTALLER "Build the legacy installer" ON)
+option (BUILD_TESTS "Override building of tests" ON)
 
 if (DEFINED ENV{SYNERGY_ENTERPRISE})
   option (SYNERGY_ENTERPRISE "Build Enterprise" ON)

ChangeLog

@@ -21,6 +21,7 @@ Enhancements:
 - #6718 Action to test PR's for updated changelog
 - #6722 Allow servers to be announced by screen name instead of IP
 - #6720 Add macqtdeploy to cmake
+- #6725 Disable the building of tests with CMake option
 
 Features:
 - #6538 System-wide config for all system users

src/CMakeLists.txt

@@ -23,4 +23,6 @@ if (SYNERGY_BUILD_LEGACY_GUI)
 add_subdirectory(gui)
 endif (SYNERGY_BUILD_LEGACY_GUI)
 
-add_subdirectory(test)
+if (BUILD_TESTS)
+	add_subdirectory(test)
+endif()

src/lib/synergy/KeyMap.h

@@ -24,7 +24,9 @@
 #include "common/stdset.h"
 #include "common/stdvector.h"
 
-#include <gtest/gtest_prod.h>
+#ifdef TEST_ENV
+#include "gtest/gtest_prod.h"
+#endif
 
 namespace synergy {
 
@@ -326,6 +328,7 @@ public:
 
 	//@}
 
+#ifdef TEST_ENV
 private:
 	FRIEND_TEST(KeyMapTests,
 				findBestKey_requiredDown_matchExactFirstItem);
@@ -340,7 +343,7 @@ private:
 	FRIEND_TEST(KeyMapTests,
 				findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
 	FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
-
+#endif
 private:
 	//! Ways to synthesize a key
 	enum EKeystroke {

src/test/unittests/synergy/KeyMapTests.cpp

@@ -15,6 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#define TEST_ENV
+
 #include "synergy/KeyMap.h"
 
 #include "test/global/gtest.h"