From b131bd9d25782b933db4b1fd75a246ce8ecf6b76 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 26 Mar 2021 10:49:34 +0100 Subject: [PATCH 1/2] Change the URL to internal release That will fix our documentation testsuite. --- Scripts/developer_scripts/autotest_cgal | 2 +- Scripts/developer_scripts/autotest_cgal_with_ctest | 2 +- Scripts/developer_scripts/run_doxygen_testsuite | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal index 558256bc1b5..cbf481b7b31 100755 --- a/Scripts/developer_scripts/autotest_cgal +++ b/Scripts/developer_scripts/autotest_cgal @@ -60,7 +60,7 @@ WGET="wget" WGET_OPTS="--no-check-certificate --no-verbose" CURL="curl" CURL_OPTS="-k --remote-name --silent --location-trusted" -CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" +CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases" LATEST_LOCATION="${CGAL_URL}/LATEST" TAR="tar" GZIP="gzip" diff --git a/Scripts/developer_scripts/autotest_cgal_with_ctest b/Scripts/developer_scripts/autotest_cgal_with_ctest index 3cfe83b02c0..d5fe28ced9e 100755 --- a/Scripts/developer_scripts/autotest_cgal_with_ctest +++ b/Scripts/developer_scripts/autotest_cgal_with_ctest @@ -16,7 +16,7 @@ export WGET="wget" export WGET_OPTS="--no-check-certificate --no-verbose" export CURL="curl" export CURL_OPTS="-k --remote-name --silent --location-trusted" -export CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" +export CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases" export UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming" export LATEST_LOCATION="${CGAL_URL}/LATEST" export TAR="tar" diff --git a/Scripts/developer_scripts/run_doxygen_testsuite b/Scripts/developer_scripts/run_doxygen_testsuite index f5cd10a1f12..62e1a5d2eeb 100755 --- a/Scripts/developer_scripts/run_doxygen_testsuite +++ b/Scripts/developer_scripts/run_doxygen_testsuite @@ -22,8 +22,8 @@ function error() { exit 1 } -CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" -CURL_OPTS="--remote-name --silent -n" +CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases" +CURL_OPTS="--remote-name --silent --location --netrc" LATEST_LOCATION="${CGAL_URL}/LATEST" CGAL_DOC_BUILD="/home/cgal-testsuite/cgal_doc_build" From b680815c03d3ad4d92107aecb2afb6d43dcd8154 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 26 Mar 2021 10:50:02 +0100 Subject: [PATCH 2/2] Remove trailing whitespace --- Scripts/developer_scripts/autotest_cgal | 12 ++++++------ Scripts/developer_scripts/autotest_cgal_with_ctest | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Scripts/developer_scripts/autotest_cgal b/Scripts/developer_scripts/autotest_cgal index cbf481b7b31..b629bb2eace 100755 --- a/Scripts/developer_scripts/autotest_cgal +++ b/Scripts/developer_scripts/autotest_cgal @@ -653,7 +653,7 @@ EOF cat >> "$file" <> "${ACTUAL_LOGFILE}" +echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}" # Sanity checks if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then @@ -865,11 +865,11 @@ fi # Detects cygwin if uname | grep -q "CYGWIN"; then JOM="`which jom`" - if [ -e "$JOM" ]; then + if [ -e "$JOM" ]; then CMAKE_GENERATOR='-GNMake Makefiles JOM' MAKE_CMD='jom' log "${ACTUAL_LOGFILE}" "Cygwin detected, jom detected, using jom" - else + else CMAKE_GENERATOR='-GNMake Makefiles' MAKE_CMD='nmake' log "${ACTUAL_LOGFILE}" "Cygwin detected, using nmake" @@ -886,7 +886,7 @@ if [ -z "$IS_CYGWIN" ]; then lockfile -r 1 "$LOCK_FILE"; if [ ${?} != 0 ]; then 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"; exit 1; else diff --git a/Scripts/developer_scripts/autotest_cgal_with_ctest b/Scripts/developer_scripts/autotest_cgal_with_ctest index d5fe28ced9e..1ae365c3ada 100755 --- a/Scripts/developer_scripts/autotest_cgal_with_ctest +++ b/Scripts/developer_scripts/autotest_cgal_with_ctest @@ -190,7 +190,7 @@ unzip_cgal() # Parse command line arguments for arg in "$@" do - case "$arg" in + case "$arg" in "-c") echo "Using latest unzipped release instead of getting a new one from the server" USE_LATEST_UNZIPPED="y" @@ -237,7 +237,7 @@ LOCK_FILE="${CGAL_HOME}/autotest_cgal_with_cmake.lock" ACTUAL_LOGFILE="${CGAL_HOME}/`basename ${0}`.log" rm -f "${ACTUAL_LOGFILE}" -echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}" +echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}" cd "$CGAL_HOME"