From 3913704040e7881ae5c33c1da2d1336529398ea5 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Mon, 12 Aug 2013 17:35:51 -0400 Subject: [PATCH] sys info tweaks Signed-off-by: Jason Etheridge --- installer/wheezy/eg_wheezy_installer.sh | 3 ++- qa/test_output_webifier.pl | 11 ++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh index 5d5c4cab8..480185677 100755 --- a/installer/wheezy/eg_wheezy_installer.sh +++ b/installer/wheezy/eg_wheezy_installer.sh @@ -328,8 +328,9 @@ if [ $LIVETEST ]; then su - opensrf sh -c 'export PATH=/openils/bin:$PATH ; cd /home/opensrf/Evergreen/Open-ILS/src/perlmods/ ; make livecheck; echo Return Value = $?' echo End of perl live tests =~-._ echo _.-~= Gathering system information + echo '' uname -a - echo 'select version();' | psql -At + echo 'select version();' | su - postgres -c 'psql -At' echo '' cat /proc/meminfo echo '' diff --git a/qa/test_output_webifier.pl b/qa/test_output_webifier.pl index 21df331bb..36f3f50f4 100755 --- a/qa/test_output_webifier.pl +++ b/qa/test_output_webifier.pl @@ -6,6 +6,7 @@ my $state = 'skipping'; my $error_count = 0; my $subpage_count = 0; +my $subpage = ''; my $opensrf_tip = ''; my $evergreen_tip = ''; @@ -26,14 +27,15 @@ while (my $line = <>) { $evergreen_tip = $1; } if ($line =~ /_\.-~= (.*)$/) { + $subpage = $1; $state = 'outputting'; print_pass_or_fail(); $error_count = 0; $subpage_count++; - print MAIN_PAGE qq^\n
  • $1^; + print MAIN_PAGE qq^\n
  • $subpage^; open SUB_PAGE, ">test.$subpage_count.html"; - print SUB_PAGE html_header($1); - print SUB_PAGE "

    $1

    \n
    ";
    +        print SUB_PAGE html_header($subpage);
    +        print SUB_PAGE "

    $subpage

    \n
    ";
         }
         if ($state eq 'outputting') {
             my $class = 'output ';
    @@ -75,6 +77,9 @@ while (my $line = <>) {
             ) {
                 $class .= 'comment ';
             }
    +        if ($subpage eq 'Gathering system information') {
    +            $class = '';
    +        }
             chomp $line;
             my $html_line = "$line";
             print SUB_PAGE "$html_line\n";
    -- 
    2.11.0