Merge branch 'testing-set-timeouts'

Author: dannyedel

CMakeLists.txt

@@ -72,6 +72,9 @@ target_link_libraries(dspdfviewer libdspdfviewer)
 ### ... and link it with the tests to produce a testing executable.
 if(BuildTests)
 	# Run unit tests regardless of debug/release
+	# Set a default timeout to 60 seconds
+	set(DART_TESTING_TIMEOUT 60)
+	set(CTEST_TEST_TIMEOUT 60)
 	include(CTest)
 	add_subdirectory(testing)
 endif()

_travis/test

@@ -9,6 +9,3 @@ if [ "$TRAVIS_OS_NAME" = "linux" ] ; then
 else
 	ctest --output-on-failure --timeout 60
 fi
-
-# print coverage report, ignore errors
-ctest -T coverage || true

testing/CMakeLists.txt

@@ -136,7 +136,6 @@ if(UseQtFive)
 		)
 		set_tests_properties(testswapscreen
 			PROPERTIES
-				TIMEOUT 60
 				SKIP_RETURN_CODE 77
 		)
 	endif()