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

Merge pull request #5557 from lrineau/Scripts-fix_doc_testsuite-GF 

Change the URL to internal releases
This commit is contained in:
Laurent Rineau 2021-03-31 15:06:00 +02:00
parent f650c2f467 b680815c03
commit 854fa38f11
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Scripts/developer_scripts/autotest_cgal
View File

@ -60,7 +60,7 @@ WGET="wget"
WGET_OPTS="--no-check-certificate --no-verbose" WGET_OPTS="--no-check-certificate --no-verbose"
CURL="curl" CURL="curl"
CURL_OPTS="-k --remote-name --silent --location-trusted" 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" LATEST_LOCATION="${CGAL_URL}/LATEST"
TAR="tar" TAR="tar"
GZIP="gzip" GZIP="gzip"
@ -653,7 +653,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
@ -791,7 +791,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"
@ -837,7 +837,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
@ -865,11 +865,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"
@ -886,7 +886,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

6
Scripts/developer_scripts/autotest_cgal_with_ctest
View File

@ -16,7 +16,7 @@ export WGET="wget"
export WGET_OPTS="--no-check-certificate --no-verbose" export WGET_OPTS="--no-check-certificate --no-verbose"
export CURL="curl" export CURL="curl"
export CURL_OPTS="-k --remote-name --silent --location-trusted" 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 UPLOAD_RESULT_DESTINATION="cgaltest@cgaltest.geometryfactory.com:incoming"
export LATEST_LOCATION="${CGAL_URL}/LATEST" export LATEST_LOCATION="${CGAL_URL}/LATEST"
export TAR="tar" export TAR="tar"
@ -190,7 +190,7 @@ unzip_cgal()
# 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"
@ -237,7 +237,7 @@ LOCK_FILE="${CGAL_HOME}/autotest_cgal_with_cmake.lock"
ACTUAL_LOGFILE="${CGAL_HOME}/`basename ${0}`.log" ACTUAL_LOGFILE="${CGAL_HOME}/`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}"
cd "$CGAL_HOME" cd "$CGAL_HOME"

4
Scripts/developer_scripts/run_doxygen_testsuite
View File

@ -22,8 +22,8 @@ function error() {
exit 1 exit 1
} }
CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases" CGAL_URL="https://cgal.geometryfactory.com/CGAL/Releases"
CURL_OPTS="--remote-name --silent -n" CURL_OPTS="--remote-name --silent --location --netrc"
LATEST_LOCATION="${CGAL_URL}/LATEST" LATEST_LOCATION="${CGAL_URL}/LATEST"
CGAL_DOC_BUILD="/home/cgal-testsuite/cgal_doc_build" CGAL_DOC_BUILD="/home/cgal-testsuite/cgal_doc_build"