Commit 42721564 authored by Jan Möbius's avatar Jan Möbius

And moving back

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@12874 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 4b7817e7
......@@ -46,7 +46,7 @@ add_subdirectory (OpenFlipper/PluginLib)
# ========================================================================
# Tests
# ========================================================================
add_subdirectory (OpenFlipper/tests)
add_subdirectory (tests)
# ========================================================================
# Documentation generators
......
......@@ -5,6 +5,8 @@ INCLUDE(CTest)
if(BUILD_TESTING)
SET (CTEST_DROP_SITE_CDASH FALSE)
# ========================================================================
# Copy converter files from ctest output to junit output
# ========================================================================
......@@ -12,7 +14,7 @@ if(BUILD_TESTING)
${CMAKE_BINARY_DIR}/tests/CTest2JUnit.py COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/CTest2JUnit.xsl
${CMAKE_BINARY_DIR}/tests//CTest2JUnit.xsl COPYONLY)
${CMAKE_BINARY_DIR}/tests/CTest2JUnit.xsl COPYONLY)
......@@ -31,18 +33,17 @@ if(BUILD_TESTING)
# ========================================================================
ADD_TEST(BatchStart ${CMAKE_BINARY_DIR}/Build/bin/OpenFlipper -b -c )
# Timeout after 60 seconds if we havean endless loop
# Should be run serial to avoid collisons with other instances
# Only one processor required
set_tests_properties (
BatchStart PROPERTIES
TIMEOUT 1
TIMEOUT 60
RUN_SERIAL TRUE
PROCESSORS 1
)
# ========================================================================
# ========================================================================
# ========================================================================
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment