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

Add Compiler and OS Info to the TestSuite description table (#8188) 

## Summary of Changes
Add Compiler and OS Information to TestSuite Platform Description Table
This PR is linked with those PRs:
   - https://github.com/CGAL/cgal-testsuite-dockerfiles/pull/153
   - https://github.com/CGAL/cgal-testsuite-dockerfiles/pull/154

The version of this Pull Request can be reviewed at [this
link](https://cgal.geometryfactory.com/~nsaillant/testsuite8188/TESTRESULTS/)

## Release Management

* Issue(s) solved (if any): #8167
This commit is contained in:
Sebastien Loriot 2024-10-23 11:57:16 +02:00 committed by GitHub
parent 3ad6e21f14 9b4c27d470
commit 2a572754d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 412 additions and 397 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Installation/CMakeLists.txt
View File

@ -361,13 +361,17 @@ include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake)
cgal_setup_module_path() cgal_setup_module_path()
if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE) if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
message(STATUS "Operating system:") find_program(LSB_RELEASE_EXEC lsb_release)
if(LSB_RELEASE_EXEC)
execute_process( execute_process(
COMMAND uname -a COMMAND ${LSB_RELEASE_EXEC} -ds
TIMEOUT 5 OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
OUTPUT_VARIABLE uname_a OUTPUT_STRIP_TRAILING_WHITESPACE
ERROR_VARIABLE uname_a) )
message(STATUS "${uname_a}") message(STATUS "Operating system: ${LSB_RELEASE_ID_SHORT} ${CMAKE_SYSTEM_PROCESSOR}")
else()
message(STATUS "Operating system: ${CMAKE_SYSTEM_NAME} ${CMAKE_SYSTEM_VERSION}")
endif()
cgal_display_compiler_version() cgal_display_compiler_version()
endif() endif()

39
Maintenance/test_handling/create_testresult_page
View File

@ -466,23 +466,25 @@ sub print_platform_descriptions()
<h2><a name="platforms">Platform Description and Summary</a></h2> <h2><a name="platforms">Platform Description and Summary</a></h2>
<table border="1" cellspacing="2" cellpadding="5" class="summary"> <table border="1" cellspacing="2" cellpadding="5" class="summary">
<tr align="center"> <tr align="center">
<th colspan="2">OS and compiler</th> <th colspan="2">Platform Name</th>
<th>Tester</th> <th>Compiler</th>
<th class="ok">y</th> <th>Operating System</th>
<th class="third_party_warning">t</th> <th>Tester</th>
<th class="warning">w</th> <th class="ok">y</th>
<th class="timeout">o</th> <th class="third_party_warning">t</th>
<th class="error">n</th> <th class="warning">w</th>
<th class="requirements">r</th> <th class="timeout">o</th>
<th class="error">n</th>
<th class="requirements">r</th>
<th>DEBUG?</th> <th>DEBUG?</th>
<th>CMake</th> <th>CMake</th>
<th>BOOST</th> <th>BOOST</th>
<th>MPFR</th> <th>MPFR</th>
<th>GMP</th> <th>GMP</th>
<th>QT</th> <th>QT</th>
<th>LEDA</th> <th>LEDA</th>
<th>CXXFLAGS</th> <th>CXXFLAGS</th>
<th>LDFLAGS</th> <th>LDFLAGS</th>
</tr> </tr>
EOF EOF
my ($platform_num)=(0); my ($platform_num)=(0);
@ -502,6 +504,9 @@ EOF
chomp; chomp;
my $compiler = $_; my $compiler = $_;
print OUTPUT " title=\"$compiler\">$pf_short</a>"; print OUTPUT " title=\"$compiler\">$pf_short</a>";
$_ = <PLATFORM_INFO>; # OPERATING_SYSTEM
chomp;
my $operating_system = $_;
$_ = <PLATFORM_INFO>; # TESTER_NAME $_ = <PLATFORM_INFO>; # TESTER_NAME
chomp; chomp;
my $tester_name = $_; my $tester_name = $_;
@ -529,6 +534,8 @@ EOF
chomp; chomp;
my $build_type = $platform_is_optimized{$pf} ? " - " : "YES"; my $build_type = $platform_is_optimized{$pf} ? " - " : "YES";
print OUTPUT "</td>\n"; print OUTPUT "</td>\n";
print OUTPUT "<td>$compiler</td>\n"; # Compiler
print OUTPUT "<td>$operating_system</td>\n"; # Operating System
print OUTPUT "<td><a href=\"mailto:$tester_address\">$tester_name</a></td>\n"; print OUTPUT "<td><a href=\"mailto:$tester_address\">$tester_name</a></td>\n";
print OUTPUT "<td>$county</td>\n"; print OUTPUT "<td>$county</td>\n";
print OUTPUT "<td>$countt</td>\n"; print OUTPUT "<td>$countt</td>\n";

6
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,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE,$TPL) = ("-","-","-","-","-","-","-","-","-","-","-","no","TPL:"); my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$OS,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE,$TPL) = ("-","-","-","-","-","-","-","-","-","-","-","no","TPL:");
my ($LDFLAGS,$CXXFLAGS) = ("", ""); my ($LDFLAGS,$CXXFLAGS) = ("", "");
while (! /^------/) { while (! /^------/) {
if(/^\s*$/) { if(/^\s*$/) {
@ -72,6 +72,9 @@ sub reformat_results($)
if (/COMPILER_VERSION = '([^']+)'/) { if (/COMPILER_VERSION = '([^']+)'/) {
$COMPILER = $1; $COMPILER = $1;
} }
if (/-- Operating system: (.*)/) {
$OS = $1;
}
if (/^TESTER_NAME\s+(.*)$/) { if (/^TESTER_NAME\s+(.*)$/) {
$TESTER_NAME = $1; $TESTER_NAME = $1;
} }
@ -147,6 +150,7 @@ NEXT: if(! ($_= <PLATFORM_RESULTS>)) {
print PLATFORM_INFO <<"EOF"; print PLATFORM_INFO <<"EOF";
$CGAL_VERSION $CGAL_VERSION
$COMPILER $COMPILER
$OS
$TESTER_NAME $TESTER_NAME
$TESTER_ADDRESS $TESTER_ADDRESS
$CMAKE $CMAKE