From 5a0a179939803ff0e076cd6bb3647f004ba8e09f Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Thu, 18 Sep 2008 09:43:51 +0000 Subject: [PATCH] Highlight cmake platforms, in test results pages --- .../test_handling/create_testresult_page | 71 ++++++++++++------- Maintenance/test_handling/to_zipped_format | 5 ++ 2 files changed, 52 insertions(+), 24 deletions(-) diff --git a/Maintenance/test_handling/create_testresult_page b/Maintenance/test_handling/create_testresult_page index 92f75002df3..3238948b343 100755 --- a/Maintenance/test_handling/create_testresult_page +++ b/Maintenance/test_handling/create_testresult_page @@ -23,6 +23,7 @@ my $release_name; my @platforms_to_do; my @known_platforms; my %platform_short_names; +my %platform_use_cmake; my @available_platforms; my %test_directories = (); my @testresults; @@ -207,6 +208,8 @@ sub print_resultpage() my $platform_count = scalar(@platforms_to_do); print OUTPUT '

Test Results

'."\n"; + print OUTPUT '

In the table below, each column is numeroted, and correspond to a platform. '; + print OUTPUT 'Each column number is a link to the platform description table.

', "\n"; if ($PLATFORMS_BESIDE_RESULTS) { print OUTPUT <<"EOF"; @@ -334,39 +337,52 @@ EOF $pf_no++; # my $pf_short = join('_',parse_platform_2($pf)); my $pf_short = $pf; - print OUTPUT "\n"; + print OUTPUT "\n"; + print OUTPUT "\n"; + print OUTPUT "\n"; + print OUTPUT "\n"; + $index = 11; + while ($index) { + $index--; + $_ = $tmp[$index]; + print OUTPUT "\n"; } } else { - print OUTPUT "\n"; + } } ++$platform_num; } @@ -379,7 +395,13 @@ sub print_platforms_numbers() foreach $platform (@platforms_to_do) { ++$platform_num; my $pf_short = short_pfname($platform); - print OUTPUT "\n\n"; + print OUTPUT "\n"; } print OUTPUT "
$pf_short\n"; + print OUTPUT "$pf_short"; if (open (PLATFORM_INFO, "results_${pf}.info")) { - $_ = ; - $_ = ; - $_ = ; + $_ = ; # CGAL_VERSION + $_ = ; # TESTER + $_ = ; # TESTER_NAME chomp; my $tester_name = $_; - $_ = ; + $_ = ; # TESTER_ADDRESS chomp; my $tester_address = $_; - print OUTPUT "$tester_name\n"; - my $count; - $count = $testresults[$platform_num]->{"y"}; - print OUTPUT "$count\n"; - $count = $testresults[$platform_num]->{"w"}; - print OUTPUT "$count\n"; - $count = $testresults[$platform_num]->{"n"}; - print OUTPUT "$count\n"; + my $county = $testresults[$platform_num]->{"y"}; + my $countw = $testresults[$platform_num]->{"w"}; + my $countn = $testresults[$platform_num]->{"n"}; my $index = 11; + my @tmp; while ($index) { $index--; $_ = ; chomp; - print OUTPUT "$_\n"; + $tmp[$index] = $_; + } + $_ = ; + chomp; + $platform_use_cmake{$pf} = $_; + if($_) { # if use cmake + print OUTPUT " (CMAKE)" + } + print OUTPUT "$tester_name$county$countw$countn$_?\n"; - print OUTPUT "?\n"; - print OUTPUT "?\n"; - print OUTPUT "?\n"; + my $index = 15; + while ($index) { + print OUTPUT "?$platform_num\n"; + my $class = ""; + my $tag = ""; + if( $platform_use_cmake{$platform}) { + $class = " class=\"cmake\""; + $tag = " (cmake platform)"; + } + print OUTPUT "$platform_num\n"; } } @@ -391,7 +413,11 @@ sub print_platforms() print OUTPUT "
$pf_no\n"; $pf_no++; my $pf_short = short_pfname($pf); - print OUTPUT "$platform_short_names{$pf_short}\n
$platform_short_names{$pf_short}"; + if($platform_use_cmake{$pf}) { + print OUTPUT " (CMAKE)" + } + print OUTPUT "\n
\n"; } @@ -439,9 +465,6 @@ EOF } print OUTPUT "\n"; - print OUTPUT '

The description of all platforms is at the end of the page. '; - print OUTPUT 'In the table below, each column is numeroted, and correspond to a platform. '; - print OUTPUT 'Each column number is a link to the platform description table.

', "\n"; } @@ -477,8 +500,8 @@ sub main() chdir $release_name or die; collect_results(); print_little_header(); - print_resultpage(); print_platform_descriptions(); + print_resultpage(); print OUTPUT << 'EOF';

This page has been created by the test results diff --git a/Maintenance/test_handling/to_zipped_format b/Maintenance/test_handling/to_zipped_format index 9e761c60130..16d0d34b1fc 100755 --- a/Maintenance/test_handling/to_zipped_format +++ b/Maintenance/test_handling/to_zipped_format @@ -32,6 +32,7 @@ sub reformat_results($) $_ = shift; s/\.tar//; my $platform = $_; + my $use_cmake = 0; # system("dos2unix ${platform}.txt ${platform}.txt"); open (PLATFORM_RESULTS,"<${platform}.txt") or return; my $line; @@ -46,6 +47,9 @@ sub reformat_results($) if(/^\s*$/) { goto NEXT; } + if(/^-- USING /) { + $use_cmake = 1; + } if (/^CGAL_VERSION\s+([\w\.-]+)/) { $CGAL_VERSION = $1; } @@ -143,6 +147,7 @@ $TAUCS $LEDA_VERSION $CXXFLAGS $LDFLAGS +$use_cmake EOF close(PLATFORM_INFO); close(PLATFORM_RESULTS);