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

16
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}"`
@ -666,7 +666,7 @@ EOF
cat >> "$file" <<EOF cat >> "$file" <<EOF
echo 'COLLECTING RESULTS'; echo 'COLLECTING RESULTS';
./collect_cgal_testresults_from_cmake; ./collect_cgal_testresults_from_cmake;
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
echo 'COLLECTING DEMOS BINARIES'; echo 'COLLECTING DEMOS BINARIES';
tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
fi fi
@ -804,7 +804,7 @@ put_on_web()
# Parse command line arguments # Parse command line arguments
for arg in "$@" for arg in "$@"
do do
case "$arg" in case "$arg" in
"-c") "-c")
echo "Using latest unzipped release instead of getting a new one from the server" echo "Using latest unzipped release instead of getting a new one from the server"
USE_LATEST_UNZIPPED="y" USE_LATEST_UNZIPPED="y"
@ -850,7 +850,7 @@ LIST_TEST_PACKAGES="${CGAL_ROOT}/list_test_packages"
ACTUAL_LOGFILE="${CGAL_ROOT}/`basename ${0}`.log" ACTUAL_LOGFILE="${CGAL_ROOT}/`basename ${0}`.log"
rm -f "${ACTUAL_LOGFILE}" rm -f "${ACTUAL_LOGFILE}"
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}" echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
# Sanity checks # Sanity checks
if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then
@ -878,11 +878,11 @@ fi
# Detects cygwin # Detects cygwin
if uname | grep -q "CYGWIN"; then if uname | grep -q "CYGWIN"; then
JOM="`which jom`" JOM="`which jom`"
if [ -e "$JOM" ]; then if [ -e "$JOM" ]; then
CMAKE_GENERATOR='-GNMake Makefiles JOM' CMAKE_GENERATOR='-GNMake Makefiles JOM'
MAKE_CMD='jom' MAKE_CMD='jom'
log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom" log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom"
else else
CMAKE_GENERATOR='-GNMake Makefiles' CMAKE_GENERATOR='-GNMake Makefiles'
MAKE_CMD='nmake' MAKE_CMD='nmake'
log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake" log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake"
@ -899,7 +899,7 @@ if [ -z "$IS_CYGWIN" ]; then
lockfile -r 1 "$LOCK_FILE"; lockfile -r 1 "$LOCK_FILE";
if [ ${?} != 0 ]; then if [ ${?} != 0 ]; then
PID=`cat "$LOCK_FILE"` PID=`cat "$LOCK_FILE"`
if kill -0 "$PID"; then if kill -0 "$PID"; then
log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID"; log "${ACTUAL_LOGFILE}" "COULD NOT ACQUIRE LOCK! LOCKING PROCESS PID=$PID";
exit 1; exit 1;
else else
@ -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