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

Merge branch '5.2.x-branch' into 5.3.x-branch

This commit is contained in:
Laurent Rineau 2021-11-30 10:26:40 +01:00
parent 676c367852 07cfbc21d8
commit 8723095ce0
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Scripts/developer_scripts/autotest_cgal
View File

@ -24,7 +24,7 @@
#sets the umask to 022 & 0777 #sets the umask to 022 & 0777
umask 022 umask 022
# Warn deprecated use of enviroment variables to pass on flags # Warn deprecated use of environment variables to pass on flags
if [ -n "$TESTSUITE_CXXFLAGS" ] ; then if [ -n "$TESTSUITE_CXXFLAGS" ] ; then
echo "\$TESTSUITE_CXXFLAGS is deprecated. Please use the CMAKE variable (CMAKE|CGAL)_CXX_FLAGS instead" >&2; echo "\$TESTSUITE_CXXFLAGS is deprecated. Please use the CMAKE variable (CMAKE|CGAL)_CXX_FLAGS instead" >&2;
fi fi
@ -380,6 +380,8 @@ setup_dirs()
CGAL_DIR=`readlink "${CGAL_ROOT}/CGAL-I"` CGAL_DIR=`readlink "${CGAL_ROOT}/CGAL-I"`
CGAL_TEST_DIR=${CGAL_DIR}/test CGAL_TEST_DIR=${CGAL_DIR}/test
CGAL_DATA_DIR=${CGAL_DIR}/data
export CGAL_DATA_DIR=$(echo "$CGAL_DATA_DIR" | sed -E 's/\/cygdrive\/([a-z])\//\U\1:\//')
if [ ! -d "${CGAL_DIR}/cmake" ]; then if [ ! -d "${CGAL_DIR}/cmake" ]; then
mkdir "${CGAL_DIR}/cmake" mkdir "${CGAL_DIR}/cmake"
@ -619,9 +621,7 @@ LIST_TEST_PACKAGES='${LIST_TEST_PACKAGES}'
CGAL_ROOT='${CGAL_ROOT}' CGAL_ROOT='${CGAL_ROOT}'
rm -rf '${CGAL_BINARY_DIR}/test'; rm -rf '${CGAL_BINARY_DIR}/test';
if [ -f '${LIST_TEST_PACKAGES}' ]; then if [ -f '${LIST_TEST_PACKAGES}' ]; then
mkdir '${CGAL_BINARY_DIR}/test' mkdir '${CGAL_BINARY_DIR}/test'
cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake' '${CGAL_BINARY_DIR}/test' cp '${CGAL_TEST_DIR}/collect_cgal_testresults_from_cmake' '${CGAL_BINARY_DIR}/test'
@ -633,7 +633,10 @@ if [ -f '${LIST_TEST_PACKAGES}' ]; then
for PACKAGE in \$(ls "${CGAL_TEST_DIR}"); do for PACKAGE in \$(ls "${CGAL_TEST_DIR}"); do
if [ -d "${CGAL_TEST_DIR}/\$PACKAGE" ]; then if [ -d "${CGAL_TEST_DIR}/\$PACKAGE" ]; then
if source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}' | egrep -q \$PACKAGE; then if source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}' | egrep -q \$PACKAGE; then
mkdir "\${CGAL_BINARY_DIR}/test/\${PACKAGE}" mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
elif [ "\$PACKAGE" = "resources" ]; then
mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test' cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
else else
mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}" mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"

5
Scripts/developer_scripts/autotest_cgal_with_ctest
View File

@ -97,8 +97,10 @@ download_latest()
fi fi
log "${ACTUAL_LOGFILE}" "getting LATEST" log "${ACTUAL_LOGFILE}" "getting LATEST"
if [ -n "${USE_CURL}" ]; then if [ -n "${USE_CURL}" ]; then
echo "using curl..."
${CURL} ${CURL_OPTS} "${LATEST_LOCATION}" >> "${ACTUAL_LOGFILE}" 2>&1 ${CURL} ${CURL_OPTS} "${LATEST_LOCATION}" >> "${ACTUAL_LOGFILE}" 2>&1
else else
echo "using wget..."
${WGET} ${WGET_OPTS} "${LATEST_LOCATION}" >> "${ACTUAL_LOGFILE}" 2>&1 ${WGET} ${WGET_OPTS} "${LATEST_LOCATION}" >> "${ACTUAL_LOGFILE}" 2>&1
fi fi
if [ ! -f "LATEST" ]; then if [ ! -f "LATEST" ]; then
@ -114,8 +116,7 @@ download_latest()
abort_if_latest_already_tested() abort_if_latest_already_tested()
{ {
if [ -r "RELEASE_NR" ]; then if [ -r "RELEASE_NR" ]; then
cmp LATEST RELEASE_NR >> "${ACTUAL_LOGFILE}" if cmp LATEST RELEASE_NR >> "${ACTUAL_LOGFILE}"; then
if [ ! ${?} != 0 ]; then
log "${ACTUAL_LOGFILE}" "This release has already been tested." log "${ACTUAL_LOGFILE}" "This release has already been tested."
rm -f "$LOCK_FILE"; rm -f "$LOCK_FILE";
exit 1; exit 1;

7
Testsuite/test/collect_cgal_testresults_from_cmake
View File

@ -30,7 +30,10 @@ RESULT_FILE=''
# print timings on fd3 # print timings on fd3
print_testresult() print_testresult()
{ {
if [ ! -f ErrorOutput_$1 ] ; then if [ -f skipped ]; then
RESULT="s"
TIMING="0"
elif [ ! -f ErrorOutput_$1 ] ; then
RESULT="?" RESULT="?"
TIMING="?" TIMING="?"
else else
@ -57,7 +60,7 @@ print_testresult()
RESULT="t" RESULT="t"
fi fi
else else
if grep -E -q 'NOTICE: .*(need|require|incompatible).*and.*will not be' CompilerOutput_$1 if grep -E -q 'NOTICE: .*(need|require|incompatible).*will not be' CompilerOutput_$1
then then
RESULT="r" RESULT="r"
else else