From bea7da078056712fe07fb636d342e1fbd8ba2b4e Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Sun, 11 Feb 2007 21:53:18 +0000 Subject: [PATCH] Fix the testsuite outputs for libraries builds --- Installation/install_cgal | 13 +++++++++---- Testsuite/test/collect_cgal_testresults | 6 +++++- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Installation/install_cgal b/Installation/install_cgal index 7b9951a406c..a2a840006f1 100755 --- a/Installation/install_cgal +++ b/Installation/install_cgal @@ -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 diff --git a/Testsuite/test/collect_cgal_testresults b/Testsuite/test/collect_cgal_testresults index 3798856a4e6..2106e748808 100755 --- a/Testsuite/test/collect_cgal_testresults +++ b/Testsuite/test/collect_cgal_testresults @@ -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