mirror of https://github.com/CGAL/cgal
New testsuite process:
- release is now generated at
https://cgal.geometryfactory.com/CGAL/Members/Releases/
- tests results are collected on the same machine, via scp.
This commit is contained in:
parent
f030a7e598
commit
e0a4e48fd4
|
|
@ -22,10 +22,12 @@
|
|||
#sets the umask to 022 & 0777
|
||||
umask 022
|
||||
|
||||
SCP="scp"
|
||||
WGET="wget"
|
||||
WGET_OPTS="--no-check-certificate"
|
||||
CURL="curl"
|
||||
CURL_OPTS="--remote-name --silent --location-trusted"
|
||||
CGAL_URL="http://cgal.inria.fr/CGAL/Members/Releases"
|
||||
CURL_OPTS="-k --remote-name --silent --location-trusted"
|
||||
CGAL_URL="https://cgal.geometryfactory.com/CGAL/Members/Releases"
|
||||
LATEST_LOCATION="${CGAL_URL}/LATEST"
|
||||
TAR="tar"
|
||||
GZIP="gzip"
|
||||
|
|
@ -40,6 +42,7 @@ CGAL_ROOT=`pwd`
|
|||
FTP_SERVER="ftp-sop.inria.fr"
|
||||
FTP_STORE_DIR="geometrica/Incoming"
|
||||
FTP_OPTS="-p -v -n"
|
||||
UPLOAD_RESULT_DESTINATION="cgaltest@cgal.geometryfactory.com:incoming"
|
||||
BUILD_HOSTS="must_be_set_in_.autocgalrc"
|
||||
MAIL_ADDRESS="must_be_set_in_.autocgalrc"
|
||||
MYSHELL="must_be_set_in_.autocgalrc"
|
||||
|
|
@ -112,18 +115,19 @@ datestr()
|
|||
# $2 = target filename (basename only)
|
||||
put_on_web()
|
||||
{
|
||||
if [ -n "${USE_CURL}" ]; then
|
||||
$CURL --upload-file ${1} --user anonymous:${MAIL_ADDRESS} \
|
||||
ftp://${FTP_SERVER}/${FTP_STORE_DIR}/${2} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
else
|
||||
$FTP $FTP_OPTS $FTP_SERVER >> ${ACTUAL_LOGFILE} 2>&1 <<EOF
|
||||
quote USER anonymous
|
||||
quote PASS ${MAIL_ADDRESS}
|
||||
binary
|
||||
put ${1} ${FTP_STORE_DIR}/${2}
|
||||
quit
|
||||
EOF
|
||||
fi
|
||||
"$SCP" "${1}" "$UPLOAD_RESULT_DESTINATION"/$2 >> ${ACTUAL_LOGFILE} 2>&1
|
||||
# if [ -n "${USE_CURL}" ]; then
|
||||
# $CURL --upload-file ${1} --user anonymous:${MAIL_ADDRESS} \
|
||||
# ftp://${FTP_SERVER}/${FTP_STORE_DIR}/${2} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
# else
|
||||
# $FTP $FTP_OPTS $FTP_SERVER >> ${ACTUAL_LOGFILE} 2>&1 <<EOF
|
||||
#quote USER anonymous
|
||||
#quote PASS ${MAIL_ADDRESS}
|
||||
#binary
|
||||
#put ${1} ${FTP_STORE_DIR}/${2}
|
||||
#quit
|
||||
#EOF
|
||||
# fi
|
||||
}
|
||||
|
||||
error()
|
||||
|
|
@ -266,7 +270,8 @@ EOF
|
|||
log ${ACTUAL_LOGFILE}.${1} "RESULTS COLLECTED "${2}"-"${1}
|
||||
${TAR} cf test_results-${1}.tar "results_"$CGAL_TESTER"_"${2}".tar.gz" "results_"$CGAL_TESTER"_"${2}".txt"
|
||||
${COMPRESSOR} -9f test_results-${1}.tar
|
||||
FILENAME=${CGAL_RELEASE_ID}-test`datestr`-${2}.tar.gz
|
||||
COMPILER=`echo $2 | tr -c '[A-Za-z0-9]./[=-=]*_\'\''\":?() ' 'x'`
|
||||
FILENAME=${CGAL_RELEASE_ID}-test`datestr`-${COMPILER}.tar.gz
|
||||
LOGFILENAME="${CGAL_RELEASE_ID}-log`datestr`-${1}.gz"
|
||||
${COMPRESSOR} -9f ${ACTUAL_LOGFILE}.${1}
|
||||
mv ${ACTUAL_LOGFILE}.${1}.gz ${LOGS_DIR}/${LOGFILENAME}
|
||||
|
|
@ -298,7 +303,7 @@ get_cgal()
|
|||
if [ -n "${USE_CURL}" ]; then
|
||||
${CURL} ${CURL_OPTS} ${CGAL_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
else
|
||||
${WGET} ${CGAL_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
${WGET} ${WGET_OPTS} ${CGAL_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
fi
|
||||
if [ ${?} != 0 ]; then
|
||||
error "Could not get CGAL"
|
||||
|
|
@ -418,7 +423,7 @@ fi
|
|||
if [ -n "${USE_CURL}" ]; then
|
||||
${CURL} ${CURL_OPTS} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
else
|
||||
${WGET} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
${WGET} ${WGET_OPTS} ${LATEST_LOCATION} >> ${ACTUAL_LOGFILE} 2>&1
|
||||
fi
|
||||
if [ ! -f "LATEST" ]; then
|
||||
error "COULD NOT DOWNLOAD LATEST!"
|
||||
|
|
|
|||
Loading…
Reference in New Issue