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

Display the compiler version in test results 

I commit directly to `master`, because there is no way to test that in
`integration`.
This commit is contained in:
Laurent Rineau 2020-07-02 15:50:49 +02:00
parent 9cfb0401a4
commit 80dd558884
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Installation/cmake/modules/CGAL_Macros.cmake
View File

@ -145,6 +145,7 @@ if( NOT CGAL_MACROS_FILE_INCLUDED )
message("Search dirs:") message("Search dirs:")
message("${search_dirs}") message("${search_dirs}")
endif() endif()
message( STATUS "USING COMPILER_VERSION = '${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}'" )
endfunction() endfunction()
macro( get_dependency_version LIB ) 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") message(STATUS "${subdir}/${ENTRY_DIR_NAME} is in dont_submit")
endif() endif()
endfunction() endfunction()

8
Maintenance/test_handling/create_testresult_page
View File

@ -473,13 +473,16 @@ EOF
$pf_no++; $pf_no++;
# my $pf_short = join('_',parse_platform_2($pf)); # my $pf_short = join('_',parse_platform_2($pf));
(my $pf_short) = ($pf =~ m/_(.*)/); (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/); ($platform_is_64bits{$pf}) = ! ($pf =~ m/32/);
if (open (PLATFORM_INFO, "results_${pf}.info")) { if (open (PLATFORM_INFO, "results_${pf}.info")) {
$_ = <PLATFORM_INFO>; # CGAL_VERSION $_ = <PLATFORM_INFO>; # CGAL_VERSION
$_ = <PLATFORM_INFO>; # TESTER $_ = <PLATFORM_INFO>; # COMPILER
chomp;
my $compiler = $_;
print OUTPUT " title=\"$compiler\">$pf_short</a>";
$_ = <PLATFORM_INFO>; # TESTER_NAME $_ = <PLATFORM_INFO>; # TESTER_NAME
chomp; chomp;
my $tester_name = $_; my $tester_name = $_;
@ -520,6 +523,7 @@ EOF
} }
} }
} else { } else {
print OUTPUT ">$pf_short</a>";
my $index = 12; my $index = 12;
while ($index) { while ($index) {
print OUTPUT "<td>?</td>\n"; print OUTPUT "<td>?</td>\n";

8
Maintenance/test_handling/to_zipped_format
View File

@ -51,7 +51,7 @@ sub reformat_results($)
$_ = $line; $_ = $line;
open (PLATFORM_INFO,">${platform}.info") or return; open (PLATFORM_INFO,">${platform}.info") or return;
open (PLATFORM_NEW_RESULTS,">${platform}.new_results") 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) = ("", ""); my ($LDFLAGS,$CXXFLAGS) = ("", "");
while (! /^------/) { while (! /^------/) {
if(/^\s*$/) { if(/^\s*$/) {
@ -69,8 +69,8 @@ sub reformat_results($)
if (/LEDAWIN_VERSION = '([^']+)'/) { if (/LEDAWIN_VERSION = '([^']+)'/) {
$LEDA_VERSION="$LEDA_VERSION+win"; $LEDA_VERSION="$LEDA_VERSION+win";
} }
if (/^TESTER\s+([\w\.-]+)/) { if (/^COMPILER_VERSION = '([^']+)'/) {
$TESTER = $1; $COMPILER = $1;
} }
if (/^TESTER_NAME\s+(.*)$/) { if (/^TESTER_NAME\s+(.*)$/) {
$TESTER_NAME = $1; $TESTER_NAME = $1;
@ -140,7 +140,7 @@ NEXT: if(! ($_= <PLATFORM_RESULTS>)) {
rename("${platform}.new_results","${platform}.txt") or die "cannot rename!"; rename("${platform}.new_results","${platform}.txt") or die "cannot rename!";
print PLATFORM_INFO <<"EOF"; print PLATFORM_INFO <<"EOF";
$CGAL_VERSION $CGAL_VERSION
$TESTER $COMPILER
$TESTER_NAME $TESTER_NAME
$TESTER_ADDRESS $TESTER_ADDRESS
$CMAKE $CMAKE