mirror of https://github.com/CGAL/cgal
- call bash instead of only the script
Don't try to test skipped packages in run_testsuite_with_cmake
This commit is contained in:
parent
4b12f70605
commit
657ba50904
|
|
@ -628,11 +628,17 @@ if [ -f '${LIST_TEST_PACKAGES}' ]; then
|
||||||
cp '${CGAL_TEST_DIR}/makefile2' '${CGAL_BINARY_DIR}/test'
|
cp '${CGAL_TEST_DIR}/makefile2' '${CGAL_BINARY_DIR}/test'
|
||||||
cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake' '${CGAL_BINARY_DIR}/test'
|
cp '${CGAL_TEST_DIR}/run_testsuite_with_cmake' '${CGAL_BINARY_DIR}/test'
|
||||||
|
|
||||||
for PACKAGE in \`source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}'\`; do
|
# list all packages in CGAL_TEST_DIR. If PACKAGE is found in LIST_TEST_PACKAGES,
|
||||||
|
# copy it, else prepare for the special "skipped" case in the table.
|
||||||
if [ -d "${CGAL_TEST_DIR}/\${PACKAGE}" ]; then
|
for PACKAGE in \$(ls "${CGAL_TEST_DIR}"); do
|
||||||
mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
|
if [ -d "${CGAL_TEST_DIR}/\$PACKAGE" ]; then
|
||||||
cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
|
if source '${LIST_TEST_PACKAGES}' '${CGAL_ROOT}' | egrep -q \$PACKAGE; then
|
||||||
|
mkdir "\${CGAL_BINARY_DIR}/test/\${PACKAGE}"
|
||||||
|
cp -r "${CGAL_TEST_DIR}/\${PACKAGE}" '${CGAL_BINARY_DIR}/test'
|
||||||
|
else
|
||||||
|
mkdir "${CGAL_BINARY_DIR}/test/\${PACKAGE}"
|
||||||
|
touch "${CGAL_BINARY_DIR}/test/\${PACKAGE}/skipped"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
done
|
done
|
||||||
|
|
@ -653,7 +659,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 +797,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 +843,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 +871,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 +892,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
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
# GENERATE_TARBALLS=[ON/OFF] indicates if release tarballs should be created as DESTINATION
|
# GENERATE_TARBALLS=[ON/OFF] indicates if release tarballs should be created as DESTINATION
|
||||||
|
|
||||||
cmake_minimum_required(VERSION 3.1...3.15)
|
cmake_minimum_required(VERSION 3.1...3.15)
|
||||||
|
find_program(BASH NAMES bash sh)
|
||||||
function(process_package pkg)
|
function(process_package pkg)
|
||||||
if(VERBOSE)
|
if(VERBOSE)
|
||||||
message(STATUS "handling ${pkg}")
|
message(STATUS "handling ${pkg}")
|
||||||
|
|
@ -221,7 +221,7 @@ if (TESTSUITE)
|
||||||
if(IS_DIRECTORY "${release_dir}/test/${d}")
|
if(IS_DIRECTORY "${release_dir}/test/${d}")
|
||||||
if(NOT EXISTS "${release_dir}/test/${d}/cgal_test_with_cmake")
|
if(NOT EXISTS "${release_dir}/test/${d}/cgal_test_with_cmake")
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND ${GIT_REPO}/Scripts/developer_scripts/create_cgal_test_with_cmake
|
COMMAND ${BASH} ${GIT_REPO}/Scripts/developer_scripts/create_cgal_test_with_cmake
|
||||||
WORKING_DIRECTORY "${release_dir}/test/${d}"
|
WORKING_DIRECTORY "${release_dir}/test/${d}"
|
||||||
RESULT_VARIABLE RESULT_VAR
|
RESULT_VARIABLE RESULT_VAR
|
||||||
OUTPUT_VARIABLE OUT_VAR
|
OUTPUT_VARIABLE OUT_VAR
|
||||||
|
|
@ -247,7 +247,7 @@ if (TESTSUITE)
|
||||||
file(RENAME "${release_dir}/tmp/${d}" "${release_dir}/test/${d}_Demo")
|
file(RENAME "${release_dir}/tmp/${d}" "${release_dir}/test/${d}_Demo")
|
||||||
if(NOT EXISTS "${release_dir}/test/${d}_Demo/cgal_test_with_cmake")
|
if(NOT EXISTS "${release_dir}/test/${d}_Demo/cgal_test_with_cmake")
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND ${GIT_REPO}/Scripts/developer_scripts/create_cgal_test_with_cmake --no-run
|
COMMAND ${BASH} ${GIT_REPO}/Scripts/developer_scripts/create_cgal_test_with_cmake --no-run
|
||||||
WORKING_DIRECTORY "${release_dir}/test/${d}_Demo"
|
WORKING_DIRECTORY "${release_dir}/test/${d}_Demo"
|
||||||
RESULT_VARIABLE RESULT_VAR
|
RESULT_VARIABLE RESULT_VAR
|
||||||
OUTPUT_VARIABLE OUT_VAR
|
OUTPUT_VARIABLE OUT_VAR
|
||||||
|
|
@ -268,7 +268,7 @@ if (TESTSUITE)
|
||||||
file(RENAME "${release_dir}/tmp/${d}" "${release_dir}/test/${d}_Examples")
|
file(RENAME "${release_dir}/tmp/${d}" "${release_dir}/test/${d}_Examples")
|
||||||
if(NOT EXISTS "${release_dir}/test/${d}_Examples/cgal_test_with_cmake")
|
if(NOT EXISTS "${release_dir}/test/${d}_Examples/cgal_test_with_cmake")
|
||||||
execute_process(
|
execute_process(
|
||||||
COMMAND ${GIT_REPO}/Scripts/developer_scripts/create_cgal_test_with_cmake
|
COMMAND ${BASH} ${GIT_REPO}/Scripts/developer_scripts/create_cgal_test_with_cmake
|
||||||
WORKING_DIRECTORY "${release_dir}/test/${d}_Examples"
|
WORKING_DIRECTORY "${release_dir}/test/${d}_Examples"
|
||||||
RESULT_VARIABLE RESULT_VAR
|
RESULT_VARIABLE RESULT_VAR
|
||||||
OUTPUT_VARIABLE OUT_VAR
|
OUTPUT_VARIABLE OUT_VAR
|
||||||
|
|
|
||||||
|
|
@ -246,7 +246,9 @@ run_testsuite()
|
||||||
esac
|
esac
|
||||||
|
|
||||||
for DIR in $TEST_DIRECTORIES ; do
|
for DIR in $TEST_DIRECTORIES ; do
|
||||||
test_directory "$DIR"
|
if [ ! -f $DIR/skipped ]; then
|
||||||
|
test_directory "$DIR"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue