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

Fix the testsuite outputs for libraries builds

This commit is contained in:
Laurent Rineau 2007-02-11 21:53:18 +00:00
parent 2a6044d966
commit bea7da0780
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Installation/install_cgal
View File

@ -4254,19 +4254,24 @@ _do_compile()
MAKE_OPTION="${MAKE_OPTION} CXXFLAGS=\$(CGAL_SHARED_LIB_CXXFLAGS) shared_lib";;
esac
# Please correct the variable _buildlog_marker in the script
# "Testsuite/test/collect_cgal_testresults" if you modify the following
# variable _buildlog_marker.
_buildlog_marker="log for $1 $2 shown"
if make ${MAKE_OPTION} >"${COMPILE_LOGFILE}" 2>&1; then
log_print "Compilation of $1 $2 ${_libname} succeeded."
log_print "vvvvvvvvvvvv build log for $1 $2 shown below vvvvvvvvvvvv"
log_print "vvvvvvvvvvvv build ${_buildlog_marker} below vvvvvvvvvvvv"
eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
log_print "^^^^^^^^^^^^ build log for $1 $2 shown above ^^^^^^^^^^^^"
log_print "^^^^^^^^^^^^ build ${_buildlog_marker} above ^^^^^^^^^^^^"
${_printf} "%s\n" " done."
ANY_LIB_COMPILED='y'
return 0
else
log_print "Compilation of $1 $2 ${_libname} failed."
log_print "vvvvvvvvvvvv error messages below vvvvvvvvvvvv"
log_print "vvvvvvvvvvvv error ${_buildlog_marker} below vvvvvvvvvvvv"
eval ${_cat} \"${COMPILE_LOGFILE}\" ${INSTALL_LOGFILE_REDIRECTION}
log_print "^^^^^^^^^^^^ error messages above ^^^^^^^^^^^^"
log_print "^^^^^^^^^^^^ error ${_buildlog_marker} above ^^^^^^^^^^^^"
${_printf} "\n%s\n" "${_LEFTSPACE}Compilation of $1 $2 failed."
${_printf} "%s\n" "${_LEFTSPACE}You will be shown a log now ..."
print_filled_line

6
Testsuite/test/collect_cgal_testresults
View File

@ -75,7 +75,11 @@ do_platform()
| sed -e 's/succeeded\.$/y/' -e 's/failed\.$/n/' \
| while read libname shared_or_static y_or_no; do
mkdir "${libname}_${shared_or_static}"
_buildlog_marker="build log for ${libname} ${shared_or_static} shown"
# Make sure to let the following variable _buildlog_marker be synced
# with the variable _buildlog_marker from the script install_cgal.
_buildlog_marker="log for ${libname} ${shared_or_static} shown"
cat install.log.$1 \
| sed -n "/${_buildlog_marker} below/,/${_buildlog_marker} above/ p" \
> ${libname}_${shared_or_static}/$TEST_REPORT