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

Fixes for cmake-testsuite... 

- Use CGAL_RELEASE_DIR as CGAL_DIR to have the real setup
 - Use RUNNING_CGAL_AUTO_TEST to detect a testsuite setup
This commit is contained in:
Maxime Gimeno 2020-08-06 11:03:53 +02:00
parent 3f4c2cd127
commit 6ffb10a71c
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/test/Installation/CMakeLists.txt
View File

@ -183,7 +183,7 @@ if ( CGAL_BRANCH_BUILD )
COMMAND ${CMAKE_COMMAND} -DCGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE=ON -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH} COMMAND ${CMAKE_COMMAND} -DCGAL_DO_NOT_WARN_ABOUT_CMAKE_BUILD_TYPE=ON -DCGAL_DIR=${CGAL_DIR_CORRECT_PATH} -DCGAL_GIVEN_DIR=${CGAL_DIR_CORRECT_PATH}
"${CMAKE_CURRENT_BINARY_DIR}/test_config_file" "${CMAKE_CURRENT_BINARY_DIR}/test_config_file"
WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build-test_config_file_2") WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build-test_config_file_2")
elseif(CGAL_TEST_SUITE)#CGAL_BRANCH_BUILD elseif(RUNNING_CGAL_AUTO_TEST)#CGAL_BRANCH_BUILD
#test CGAL_DIR = CGAL-5.x/lib/cmake/CGAL #test CGAL_DIR = CGAL-5.x/lib/cmake/CGAL
get_filename_component(CGAL_DIR_CORRECT_PATH "${CGAL_SOURCE_DIR}/lib/cmake/CGAL/CMakeConfig.cmake" DIRECTORY) get_filename_component(CGAL_DIR_CORRECT_PATH "${CGAL_SOURCE_DIR}/lib/cmake/CGAL/CMakeConfig.cmake" DIRECTORY)
add_test(NAME test_config_file_2 add_test(NAME test_config_file_2

2
Installation/test/Installation/cgal_test_with_cmake
View File

@ -20,7 +20,7 @@ echo "Configuring... "
mkdir build_dir mkdir build_dir
cd build_dir cd build_dir
if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \ if eval 'cmake --no-warn-unused-cli ${INIT_FILE:+"-C${INIT_FILE}"} "$CMAKE_GENERATOR" -DRUNNING_CGAL_AUTO_TEST=TRUE \
-DCGAL_DIR="$CGAL_DIR" -DBUILD_TESTING=ON -DWITH_tests=ON \ -DCGAL_DIR="$CGAL_RELEASE_DIR" -DBUILD_TESTING=ON -DWITH_tests=ON \
..' ; then ..' ; then
echo " successful configuration" >> $ERRORFILE echo " successful configuration" >> $ERRORFILE

4
Scripts/developer_scripts/autotest_cgal
View File

@ -391,7 +391,7 @@ setup_dirs()
log "${ACTUAL_LOGFILE}" "Creating ${CGAL_DIR}/cmake/platforms" log "${ACTUAL_LOGFILE}" "Creating ${CGAL_DIR}/cmake/platforms"
fi fi
CGAL_RELEASE_DIR="${CGAL_DIR}" export CGAL_RELEASE_DIR="${CGAL_DIR}"
CGAL_RELEASE_ID=`basename "${CGAL_RELEASE_DIR}"` CGAL_RELEASE_ID=`basename "${CGAL_RELEASE_DIR}"`
@ -956,7 +956,7 @@ if [ "${BUILD_HOSTS}" = "localhost" ]; then
TEXT="`value_of COMPILERS_localhost`" TEXT="`value_of COMPILERS_localhost`"
if [ -z "${DO_NOT_TEST}" ]; then if [ -z "${DO_NOT_TEST}" ]; then
if [ -z "${TEXT}" ]; then if [ -z "${TEXT}" ]; then
printf "Skipping testing phase (use the -n option to remove this message).\n" printf "Skipping testing phase (use the -n option to remove this message).\n"
DO_NOT_TEST="y" DO_NOT_TEST="y"
fi fi
fi fi