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:
@@ -391,7 +391,7 @@ setup_dirs()
|
||||
log "${ACTUAL_LOGFILE}" "Creating ${CGAL_DIR}/cmake/platforms"
|
||||
fi
|
||||
|
||||
CGAL_RELEASE_DIR="${CGAL_DIR}"
|
||||
export CGAL_RELEASE_DIR="${CGAL_DIR}"
|
||||
|
||||
CGAL_RELEASE_ID=`basename "${CGAL_RELEASE_DIR}"`
|
||||
|
||||
@@ -666,7 +666,7 @@ EOF
|
||||
cat >> "$file" <<EOF
|
||||
echo 'COLLECTING RESULTS';
|
||||
./collect_cgal_testresults_from_cmake;
|
||||
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
|
||||
if [ -n "\$COLLECT_DEMOS_BINARIES" ]; then
|
||||
echo 'COLLECTING DEMOS BINARIES';
|
||||
tar czvf '${CGAL_TEST_DIR}/demos_${CGAL_TESTER}_${PLATFORM}.tar.gz' *_Demo/*.exe *_Demo/*.dll *_Demo/*/*.dll *_Demo/*/*/*.dll
|
||||
fi
|
||||
@@ -804,7 +804,7 @@ put_on_web()
|
||||
# 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"
|
||||
@@ -850,7 +850,7 @@ LIST_TEST_PACKAGES="${CGAL_ROOT}/list_test_packages"
|
||||
ACTUAL_LOGFILE="${CGAL_ROOT}/`basename ${0}`.log"
|
||||
rm -f "${ACTUAL_LOGFILE}"
|
||||
|
||||
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
|
||||
echo "Running `basename ${0}` "'$Revision$' >> "${ACTUAL_LOGFILE}"
|
||||
|
||||
# Sanity checks
|
||||
if [ "${REFERENCE_PLATFORMS_DIR}" = "must_be_set_in_.autocgalrc" ]; then
|
||||
@@ -878,11 +878,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"
|
||||
@@ -899,7 +899,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
|
||||
@@ -956,7 +956,7 @@ if [ "${BUILD_HOSTS}" = "localhost" ]; then
|
||||
TEXT="`value_of COMPILERS_localhost`"
|
||||
if [ -z "${DO_NOT_TEST}" ]; 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"
|
||||
fi
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user