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

Fix ctest call and clean autotest_cgal_with_ctest

This commit is contained in:
Maxime Gimeno 2019-03-13 09:26:55 +01:00
parent be07aa1267
commit 7c862f759e
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Scripts/developer_scripts/autotest_cgal_with_ctest
View File

@ -225,9 +225,6 @@ fi
CGAL_DIR=`readlink "${CGAL_ROOT}/CGAL-I"` CGAL_DIR=`readlink "${CGAL_ROOT}/CGAL-I"`
CGAL_RELEASE_ID=$(cat last_release_id) CGAL_RELEASE_ID=$(cat last_release_id)
PLATFORMS=`value_of COMPILERS_${HOST}`
#setup dir
setup_dirs
for HOST in ${BUILD_HOSTS}; do for HOST in ${BUILD_HOSTS}; do
if [ "$HOST" != "localhost" ]; then if [ "$HOST" != "localhost" ]; then
#launch docker container #launch docker container

5
Scripts/developer_scripts/run_testsuite_with_cmake
View File

@ -255,7 +255,6 @@ run_test_on_platform()
if [ -f ${LIST_TEST_FILE} ]; then if [ -f ${LIST_TEST_FILE} ]; then
LIST_TEST_PACKAGES=$(source ${LIST_TEST_FILE}) LIST_TEST_PACKAGES=$(source ${LIST_TEST_FILE})
fi fi
TO_TEST=""
INIT="" INIT=""
for pkg in $LIST_TEST_PACKAGES; do for pkg in $LIST_TEST_PACKAGES; do
if [ -z "$INIT" ]; then if [ -z "$INIT" ]; then
@ -268,9 +267,9 @@ run_test_on_platform()
CTEST_OPTS="-T Start -T Test -j${NUMBER_OF_PROCESSORS} ${DO_NOT_TEST:+-E execution___of__} --timeout 1200" CTEST_OPTS="-T Start -T Test -j${NUMBER_OF_PROCESSORS} ${DO_NOT_TEST:+-E execution___of__} --timeout 1200"
if [ -z "${SHOW_PROGRESS}" ]; then if [ -z "${SHOW_PROGRESS}" ]; then
ctest ${CTEST_OPTS} ${TO_TEST:+-L ${TO_TEST} } ${KEEP_TESTS:+-FC .}> tmp.txt ctest ${CTEST_OPTS} ${TO_TEST:+"-L ${TO_TEST}" } ${KEEP_TESTS:+-FC .}> tmp.txt
else else
ctest ${CTEST_OPTS} ${TO_TEST:+-L ${TO_TEST}} ${KEEP_TESTS:+-FC .}|tee tmp.txt ctest ${CTEST_OPTS} ${TO_TEST:+"-L ${TO_TEST}" } ${KEEP_TESTS:+-FC .}|tee tmp.txt
fi fi
##################### #####################
## GET RESULTS ## ## GET RESULTS ##