Skip to content
This repository was archived by the owner on Jan 6, 2020. It is now read-only.

MAID-730 Correct bug in CMake on MAIDSAFE_TEST_TYPE #101

Open
benjaminbollen wants to merge 1 commit into
base: next
Choose a base branch
from
Open

MAID-730 Correct bug in CMake on MAIDSAFE_TEST_TYPE #101

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 27 additions & 21 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,27 +137,33 @@ if(INCLUDE_TESTS)
set_property(TEST Multiple_Functional_Tests PROPERTY LABELS Routing Functional ${TASK_LABEL})
ms_add_gtests(test_routing)
ms_add_gtests(test_routing_api)
set(Timeout 300)
ms_update_test_timeout(Timeout)
set_property(TEST CloseNodesChangeTest.BEH_FullSizeRoutingTable PROPERTY TIMEOUT ${Timeout})
# set_property(TEST ResponseHandlerTest.BEH_FindNodes PROPERTY TIMEOUT ${Timeout})
set_property(TEST APITest.BEH_API_TypedMessagePartiallyJoinedSendReceive PROPERTY TIMEOUT ${Timeout})
set_property(TEST APITest.BEH_API_NodeNetwork PROPERTY TIMEOUT ${Timeout})
set_property(TEST APITest.BEH_API_NodeNetworkWithClient PROPERTY TIMEOUT ${Timeout})
set_property(TEST PublicKeyHolderTest.BEH_MultipleAddFindRemove PROPERTY TIMEOUT ${Timeout})
set_property(TEST PublicKeyHolderTest.BEH_MultipleAddFindTimeout PROPERTY TIMEOUT ${Timeout})
set(Timeout 1200)
ms_update_test_timeout(Timeout)
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/0 PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/1 PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/2 PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/3 PROPERTY TIMEOUT ${Timeout})
set_property(TEST RoutingTableTest.FUNC_AddTooManyNodes PROPERTY TIMEOUT ${Timeout})
set(Timeout 2400)
ms_update_test_timeout(Timeout)
set_property(TEST Multiple_Functional_Tests PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/4 PROPERTY TIMEOUT ${Timeout})
set_property(TEST RoutingTableNetwork.FUNC_GroupMessaging PROPERTY TIMEOUT ${Timeout})

if((MAIDSAFE_TEST_TYPE MATCHES "ALL") OR (MAIDSAFE_TEST_TYPE MATCHES "BEH") OR (MAIDSAFE_TEST_TYPE MATCHES "UNIT"))
set(Timeout 300)
ms_update_test_timeout(Timeout)
set_property(TEST CloseNodesChangeTest.BEH_FullSizeRoutingTable PROPERTY TIMEOUT ${Timeout})
# set_property(TEST ResponseHandlerTest.BEH_FindNodes PROPERTY TIMEOUT ${Timeout})
set_property(TEST APITest.BEH_API_TypedMessagePartiallyJoinedSendReceive PROPERTY TIMEOUT ${Timeout})
set_property(TEST APITest.BEH_API_NodeNetwork PROPERTY TIMEOUT ${Timeout})
set_property(TEST APITest.BEH_API_NodeNetworkWithClient PROPERTY TIMEOUT ${Timeout})
set_property(TEST PublicKeyHolderTest.BEH_MultipleAddFindRemove PROPERTY TIMEOUT ${Timeout})
set_property(TEST PublicKeyHolderTest.BEH_MultipleAddFindTimeout PROPERTY TIMEOUT ${Timeout})
endif()

if((MAIDSAFE_TEST_TYPE MATCHES "ALL") OR (MAIDSAFE_TEST_TYPE MATCHES "FUNC") OR (MAIDSAFE_TEST_TYPE MATCHES "UNIT"))
set(Timeout 1200)
ms_update_test_timeout(Timeout)
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/0 PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/1 PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/2 PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/3 PROPERTY TIMEOUT ${Timeout})
set_property(TEST RoutingTableTest.FUNC_AddTooManyNodes PROPERTY TIMEOUT ${Timeout})
set(Timeout 2400)
ms_update_test_timeout(Timeout)
set_property(TEST Multiple_Functional_Tests PROPERTY TIMEOUT ${Timeout})
set_property(TEST SendGroup/RoutingApi.FUNC_API_SendGroup/4 PROPERTY TIMEOUT ${Timeout})
set_property(TEST RoutingTableNetwork.FUNC_GroupMessaging PROPERTY TIMEOUT ${Timeout})
endif()
# This test target can be run separately. Removed from Experimental target to reduce the ctest time.
if(WEEKLY)
ms_add_gtests(weekly_test_routing)
Expand Down