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

MAID-730 Exclude Network MAIDSAFE_TEST_TYPE on non-network tests #50

Open
wants to merge 4 commits into
base: next
Choose a base branch
from
Open

MAID-730 Exclude Network MAIDSAFE_TEST_TYPE on non-network tests #50

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
99cc148
Exclude Network MAIDSAFE_TEST_TYPE on non-network tests
Feb 3, 2015
226b14f
Fix to CMake Network Drive Filesystem Test
Feb 4, 2015
b2bd441
Minor update to CMakeLists.txt.
Fraser999 Feb 5, 2015
e146855
Merge pull request #1 from Fraser999/benjaminbollen-MAID-730_NetworkT…
Feb 26, 2015
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
12 changes: 8 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,18 @@ if(INCLUDE_TESTS)
set(TEST_TARGET test_filesystem)
get_network_test_arg()
unset(TEST_TARGET)
add_test(NAME "\"Network Drive Filesystem Test\""
COMMAND test_filesystem --network${Console} --gtest_catch_exceptions=${CATCH_EXCEPTIONS}
$<$<BOOL:${NetworkTestArg}>:--bootstrap_file> $<$<BOOL:${NetworkTestArg}>:${NetworkTestArg}>)

set(Timeout 180)
ms_update_test_timeout(Timeout)
set_tests_properties("\"Real Disk Filesystem Test\"" "\"Local Drive Filesystem Test\"" "\"Network Drive Filesystem Test\"" PROPERTIES
set_tests_properties("\"Real Disk Filesystem Test\"" "\"Local Drive Filesystem Test\"" PROPERTIES
TIMEOUT ${Timeout} LABELS "Drive;Filesystem;${TASK_LABEL}")
if(MAIDSAFE_TEST_TYPE MATCHES "^ALL$|^NETWORK$")
add_test(NAME "\"Network Drive Filesystem Test\""
COMMAND test_filesystem --network${Console} --gtest_catch_exceptions=${CATCH_EXCEPTIONS}
$<$<BOOL:${NetworkTestArg}>:--bootstrap_file> $<$<BOOL:${NetworkTestArg}>:${NetworkTestArg}>)
set_tests_properties("\"Network Drive Filesystem Test\"" PROPERTIES
TIMEOUT ${Timeout} LABELS "Drive;Filesystem;${TASK_LABEL}")
endif()

if(WEEKLY)
add_test(NAME "\"Real Disk Weekly Test\""
Expand Down