From 80dd558884b23dbd1d2247a2d9036da9bce4a146 Mon Sep 17 00:00:00 2001
From: Laurent Rineau <laurent.rineau@cgal.org>
Date: Thu, 2 Jul 2020 15:50:49 +0200
Subject: [PATCH] Display the compiler version in test results

I commit directly to `master`, because there is no way to test that in
`integration`.
---
 Installation/cmake/modules/CGAL_Macros.cmake     | 2 +-
 Maintenance/test_handling/create_testresult_page | 8 ++++++--
 Maintenance/test_handling/to_zipped_format       | 8 ++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Installation/cmake/modules/CGAL_Macros.cmake b/Installation/cmake/modules/CGAL_Macros.cmake
index cbd17669609..e113758a102 100644
--- a/Installation/cmake/modules/CGAL_Macros.cmake
+++ b/Installation/cmake/modules/CGAL_Macros.cmake
@@ -145,6 +145,7 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
       message("Search dirs:")
       message("${search_dirs}")
     endif()
+    message( STATUS "USING COMPILER_VERSION = '${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}'" )
   endfunction()
 
   macro( get_dependency_version LIB )
@@ -702,4 +703,3 @@ function(process_CGAL_subdirectory entry subdir type_name)
     message(STATUS "${subdir}/${ENTRY_DIR_NAME} is in dont_submit")
   endif()
 endfunction()
-
diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page
index ce38de030a9..d7e3890aa73 100755
--- a/Maintenance/test_handling/create_testresult_page
+++ b/Maintenance/test_handling/create_testresult_page
@@ -473,13 +473,16 @@ EOF
 	$pf_no++;
 	# my $pf_short = join('_',parse_platform_2($pf));
 	(my $pf_short) = ($pf =~ m/_(.*)/);
-	print OUTPUT "<td><a href=\"$release_name/Installation/TestReport_$pf.gz\">$pf_short</a>";
+	print OUTPUT "<td><a href=\"$release_name/Installation/TestReport_$pf.gz\"";
 
         ($platform_is_64bits{$pf}) = ! ($pf =~ m/32/);
 
         if (open (PLATFORM_INFO, "results_${pf}.info")) {
 	    $_ = <PLATFORM_INFO>; # CGAL_VERSION
-	    $_ = <PLATFORM_INFO>; # TESTER
+	    $_ = <PLATFORM_INFO>; # COMPILER
+            chomp;
+            my $compiler = $_;
+            print OUTPUT " title=\"$compiler\">$pf_short</a>";
 	    $_ = <PLATFORM_INFO>; # TESTER_NAME
 	    chomp;
 	    my $tester_name = $_;
@@ -520,6 +523,7 @@ EOF
                 }                    
 	    }
 	} else {
+            print OUTPUT ">$pf_short</a>";
 	    my $index = 12;
 	    while ($index) {
 		print OUTPUT "<td>?</td>\n";
diff --git a/Maintenance/test_handling/to_zipped_format b/Maintenance/test_handling/to_zipped_format
index 94ee0fe2e11..3fca5787474 100755
--- a/Maintenance/test_handling/to_zipped_format
+++ b/Maintenance/test_handling/to_zipped_format
@@ -51,7 +51,7 @@ sub reformat_results($)
     $_ = $line;
     open (PLATFORM_INFO,">${platform}.info") or return;
     open (PLATFORM_NEW_RESULTS,">${platform}.new_results") or return;
-    my ($CGAL_VERSION,$LEDA_VERSION,$TESTER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$QT4,$QT5,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-","-","no");
+    my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$QT4,$QT5,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","-","-","no");
     my ($LDFLAGS,$CXXFLAGS) = ("", "");
     while (! /^------/) {
         if(/^\s*$/) {
@@ -69,8 +69,8 @@ sub reformat_results($)
 	if (/LEDAWIN_VERSION = '([^']+)'/) {
 	    $LEDA_VERSION="$LEDA_VERSION+win";
 	}
-	if (/^TESTER\s+([\w\.-]+)/) {
-	    $TESTER = $1;
+	if (/^COMPILER_VERSION = '([^']+)'/) {
+	    $COMPILER = $1;
 	}
 	if (/^TESTER_NAME\s+(.*)$/) {
 	    $TESTER_NAME = $1;
@@ -140,7 +140,7 @@ NEXT:	if(! ($_= <PLATFORM_RESULTS>)) {
     rename("${platform}.new_results","${platform}.txt") or die "cannot rename!";
     print PLATFORM_INFO <<"EOF";
 $CGAL_VERSION
-$TESTER
+$COMPILER
 $TESTER_NAME
 $TESTER_ADDRESS
 $CMAKE