songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix the testsuite of Arrangement_on_surface_2

This commit is contained in:
Laurent Rineau 2019-02-21 17:00:53 +01:00
parent 13e7f7633c
commit 5376673151
2 changed files with 3 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Arrangement_on_surface_2/test/Arrangement_on_surface_2/cgal_test.cmake
View File

@ -198,20 +198,6 @@ function(run_test_alt name datafile)
cgal_add_test(${name} cgal_add_test(${name}
TEST_NAME ${test_name} TEST_NAME ${test_name}
ARGUMENTS ${datafile} ${ARGN}) ARGUMENTS ${datafile} ${ARGN})
set_property(TEST "${test_name}"
APPEND PROPERTY DEPENDS "compilation_of__${name}")
if(POLICY CMP0066) # CMake 3.7 or later
set_tests_properties("${test_name}"
PROPERTIES
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/__exec_test_dir
FIXTURES_REQUIRED ${PROJECT_NAME})
endif()
cgal_debug_message(STATUS "# .. depends on compilation_of__${name}")
# message(" successful execution of ${name} ${ARGV4} ${ARGV5}")
set_property(TEST "${test_name}"
APPEND PROPERTY LABELS "${PROJECT_NAME}")
cgal_debug_message(STATUS "add test \"${test_name}\": ${name} ${datafile} ${ARGN}")
endfunction() endfunction()
function(run_trapped_test name datafile) function(run_trapped_test name datafile)

28
Installation/cmake/modules/CGAL_add_test.cmake
View File

@ -190,7 +190,7 @@ function(cgal_setup_test_properties test_name)
APPEND PROPERTY FIXTURES_REQUIRED "${exe_name}") APPEND PROPERTY FIXTURES_REQUIRED "${exe_name}")
set_property(TEST "compilation_of__${exe_name}" set_property(TEST "compilation_of__${exe_name}"
PROPERTY FIXTURES_SETUP "${exe_name}") PROPERTY FIXTURES_SETUP "${exe_name}")
if(NOT TEST push_of__${exe_name}) if((ANDROID OR SSH) AND NOT TEST push_of__${exe_name})
if(ANDROID) if(ANDROID)
add_test(NAME "push_of__${exe_name}" add_test(NAME "push_of__${exe_name}"
COMMAND ${adb_executable} push $<TARGET_FILE:${exe_name}> ${ANDROID_DIR_PREFIX}${PROJECT_NAME}/${exe_name}) COMMAND ${adb_executable} push $<TARGET_FILE:${exe_name}> ${ANDROID_DIR_PREFIX}${PROJECT_NAME}/${exe_name})
@ -200,11 +200,11 @@ function(cgal_setup_test_properties test_name)
endif() endif()
set_property(TEST "push_of__${exe_name}" set_property(TEST "push_of__${exe_name}"
APPEND PROPERTY DEPENDS "compilation_of__${exe_name}") APPEND PROPERTY DEPENDS "compilation_of__${exe_name}")
set_property(TEST "push_of__${exe_name}"
APPEND PROPERTY FIXTURES_SETUP "${exe_name}")
set_property(TEST "push_of__${exe_name}" set_property(TEST "push_of__${exe_name}"
APPEND PROPERTY FIXTURES_REQUIRED "${PROJECT_NAME}") APPEND PROPERTY FIXTURES_REQUIRED "${PROJECT_NAME}")
endif() endif()
set_property(TEST "${test_name}"
APPEND PROPERTY DEPENDS "push_of__${exe_name}")
endif() endif()
endif() # end CMake 3.7 or later endif() # end CMake 3.7 or later
endfunction(cgal_setup_test_properties) endfunction(cgal_setup_test_properties)
@ -283,28 +283,6 @@ function(cgal_add_test exe_name)
endif() endif()
endif() endif()
cgal_setup_test_properties(${test_name} ${exe_name}) cgal_setup_test_properties(${test_name} ${exe_name})
return()
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cin")
set(ARGS "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cin")
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV2}.cmd")
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV2}.cmd"
ARGS LIMIT_COUNT 1)
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV1}.cmd")
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/${ARGV1}.cmd"
ARGS LIMIT_COUNT 1)
elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cmd")
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/${exe_name}.cmd"
ARGS LIMIT_COUNT 1)
# TODO: handle multi-lines .cmd files
# see https://github.com/CGAL/cgal/pull/1295/files/c65d3abe17bb3e677b8077996cdaf8672f9c4c6f#r71705451
endif()
string(REPLACE ";" " " args_str "${ARGS}")
add_test(NAME ${test_name}
COMMAND ${TIME_COMMAND} $<TARGET_FILE:${exe_name}> ${ARGS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
set_property(TEST "${test_name}"
APPEND PROPERTY LABELS "${PROJECT_NAME}")
endfunction() endfunction()
function(CGAL_add_compilation_tests_for_all_targets) function(CGAL_add_compilation_tests_for_all_targets)