Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Oct 23, 2024
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2edba44
Use lsb_release for system information retrieval
SaillantNicolas May 6, 2024
559df9b
Update platform descriptions with compiler and OS details
SaillantNicolas May 6, 2024
f48042e
Merge remote-tracking branch 'cgal/master' into update_cmake_vars_for…
lrineau Sep 25, 2024
9b4c27d
Refactor indentation in a few developer scripts (remove tabs)
lrineau Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions Installation/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,17 @@ include(${CGAL_MODULES_DIR}/CGAL_enable_end_of_configuration_hook.cmake)
cgal_setup_module_path()

if(RUNNING_CGAL_AUTO_TEST OR CGAL_TEST_SUITE)
message(STATUS "Operating system:")
execute_process(
COMMAND uname -a
TIMEOUT 5
OUTPUT_VARIABLE uname_a
ERROR_VARIABLE uname_a)
message(STATUS "${uname_a}")
find_program(LSB_RELEASE_EXEC lsb_release)
if(LSB_RELEASE_EXEC)
execute_process(
COMMAND ${LSB_RELEASE_EXEC} -ds
OUTPUT_VARIABLE LSB_RELEASE_ID_SHORT
OUTPUT_STRIP_TRAILING_WHITESPACE
)
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()
endif()

Expand Down
9 changes: 8 additions & 1 deletion Maintenance/test_handling/create_testresult_page
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,9 @@ sub print_platform_descriptions()
<h2><a name="platforms">Platform Description and Summary</a></h2>
<table border="1" cellspacing="2" cellpadding="5" class="summary">
<tr align="center">
<th colspan="2">OS and compiler</th>
<th colspan="2">Platform Name</th>
<th>Compiler</th>
<th>Operating System</th>
<th>Tester</th>
<th class="ok">y</th>
<th class="third_party_warning">t</th>
Expand Down Expand Up @@ -497,6 +499,9 @@ EOF
chomp;
my $compiler = $_;
print OUTPUT " title=\"$compiler\">$pf_short</a>";
$_ = <PLATFORM_INFO>; # OPERATING_SYSTEM
chomp;
my $operating_system = $_;
$_ = <PLATFORM_INFO>; # TESTER_NAME
chomp;
my $tester_name = $_;
Expand All @@ -523,6 +528,8 @@ EOF
$_ = <PLATFORM_INFO>;
chomp;
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>$county</td>\n";
print OUTPUT "<td>$countt</td>\n";
Expand Down
6 changes: 5 additions & 1 deletion Maintenance/test_handling/to_zipped_format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,$COMPILER,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","no");
my ($CGAL_VERSION,$LEDA_VERSION,$COMPILER,$OS,$TESTER_NAME,$TESTER_ADDRESS,$GMP,$MPFR,$ZLIB,$OPENGL,$BOOST,$QT,$CMAKE) = ("-","-","-","-","-","-","-","-","-","-","-","-","-","no");
my ($LDFLAGS,$CXXFLAGS) = ("", "");
while (! /^------/) {
if(/^\s*$/) {
Expand All @@ -72,6 +72,9 @@ sub reformat_results($)
if (/COMPILER_VERSION = '([^']+)'/) {
$COMPILER = $1;
}
if (/-- Operating system: (.*)/) {
$OS = $1;
}
if (/^TESTER_NAME\s+(.*)$/) {
$TESTER_NAME = $1;
}
Expand Down Expand Up @@ -144,6 +147,7 @@ NEXT: if(! ($_= <PLATFORM_RESULTS>)) {
print PLATFORM_INFO <<"EOF";
$CGAL_VERSION
$COMPILER
$OS
$TESTER_NAME
$TESTER_ADDRESS
$CMAKE
Expand Down