Attachment #452836 for bug #598802

View | Details | Raw Unified | Return to bug 598802
Collapse All | Expand All




#include "common/stdset.h"
#include "common/stdvector.h"

#if WITH_GENTOO_TEST
#include "gtest/gtest_prod.h"
#endif

namespace synergy {


	//@}


#if WITH_GENTOO_TEST
private:
	FRIEND_TEST(KeyMapTests,
				findBestKey_requiredDown_matchExactFirstItem);

	FRIEND_TEST(KeyMapTests,
				findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
	FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
#endif

private:
	//! Ways to synthesize a key

Lines 50-55 Link Here

(-)a/src/CMakeLists.txt (-1 / +1 lines)
50	add_subdirectory(cmd)	50	add_subdirectory(cmd)
51	add_subdirectory(micro)	51	add_subdirectory(micro)
52		52
53	if (NOT ${CMAKE_SYSTEM_NAME} MATCHES "IRIX")	53	if (${WITH_GENTOO_TEST})
54	add_subdirectory(test)	54	add_subdirectory(test)
55	endif()	55	endif()

Return to bug 598802

Lines 24-30 Link Here

(-)a/src/lib/synergy/KeyMap.h (+4 lines)
24	#include "common/stdset.h"	24	#include "common/stdset.h"
25	#include "common/stdvector.h"	25	#include "common/stdvector.h"
26		26
		27	#if WITH_GENTOO_TEST
27	#include "gtest/gtest_prod.h"	28	#include "gtest/gtest_prod.h"
		29	#endif
28		30
29	namespace synergy {	31	namespace synergy {
30		32
Lines 327-332 Link Here
327	//@}	329	//@}
328		330
329		331
		332	#if WITH_GENTOO_TEST
330	private:	333	private:
331	FRIEND_TEST(KeyMapTests,	334	FRIEND_TEST(KeyMapTests,
332	findBestKey_requiredDown_matchExactFirstItem);	335	findBestKey_requiredDown_matchExactFirstItem);
Lines 341-346 Link Here
341	FRIEND_TEST(KeyMapTests,	344	FRIEND_TEST(KeyMapTests,
342	findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);	345	findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
343	FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);	346	FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
		347	#endif
344		348
345	private:	349	private:
346	//! Ways to synthesize a key	350	//! Ways to synthesize a key