smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Disable test with cmake option
This commit is contained in:
Jnewbon 2020-07-14 13:38:33 +01:00 committed by GitHub
commit c579858dd2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 433 additions and 424 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

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

1
ChangeLog
View file

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

4
src/CMakeLists.txt
View file

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

7
src/lib/synergy/KeyMap.h
View file

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

2
src/test/unittests/synergy/KeyMapTests.cpp
View file

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