diff --git a/tools/tinderbox/qatest.pl b/tools/tinderbox/qatest.pl index 0ce9922ecbd5..0d83515063b0 100755 --- a/tools/tinderbox/qatest.pl +++ b/tools/tinderbox/qatest.pl @@ -19,24 +19,37 @@ sub PrintUsage { die < + usage: $0 ["express"] END_USAGE } - -if ($#ARGV != 0) { +if ($#ARGV < 0) { PrintUsage(); } -$DATAFILE = $ARGV[0]; +my $DATAFILE = $ARGV[0]; +my $MODE; + +if($#ARGV > 0) { + $MODE = $ARGV[1]; +} else { + $MODE = ""; +} + +my $express = 0; + +if($MODE eq "express") { + $express = 1; +} my $ngdir = "http://geckoqa.mcom.com/ngdriver/"; #$input->url(-base=>1) . "/ngdriver/"; my $ngsuites = $ngdir . "suites/"; my $conffile = "ngdriver.conf"; my $HTMLreport = ""; -print "Content-type: text/html\n\n"; - +unless ($express) { + print "Content-type: text/html\n\n"; +} &generateResults; @@ -149,6 +162,25 @@ sub generateHTML my $os = `uname -s`; # Cheap OS id for now + my %Matrices; + + # Hard-coded from ngdriver.conf, I didn't want extra files in tree. + + $extList{"mb"} = "http://cemicrobrowser.web.aol.com/bugReportDetail.php?RID=%"; + $extList{"bs"} = "http://bugscape.nscp.aoltw.net/show_bug.cgi?id=%"; + $extList{"bz"} = "http://bugzilla.mozilla.org/show_bug.cgi?id=%"; + $extList{"bzx"} = "http://bugzilla.mozilla.org/show_bug.cgi?id=%"; + + $prjExtension = "bz"; # Buffy hard-coded here. + + $Matricies{"dom-core"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html"; + $Matricies{"dom-html"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html"; + $Matricies{"domevents"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html"; + $Matricies{"javascript"} = "http://geckoqa.mcom.com/browser/standards/javascript/tcmatrix/index.html"; + $Matricies{"forms"} = "http://geckoqa.mcom.com/browser/standards/form_submission/tcmatrix/index.html"; + $Matricies{"formsec"} = "http://geckoqa.mcom.com/browser/standards/form_submission/tcmatrix/index.html"; + + unless ($express) { $HTMLreport .= < @@ -172,37 +204,24 @@ sub generateHTML

The Following Test Suites Were Run:

    END_PRINT - - my %Matrices; - # Hard-coded from ngdriver.conf, I didn't want extra files in tree. - - $extList{"mb"} = "http://cemicrobrowser.web.aol.com/bugReportDetail.php?RID=%"; - $extList{"bs"} = "http://bugscape.nscp.aoltw.net/show_bug.cgi?id=%"; - $extList{"bz"} = "http://bugzilla.mozilla.org/show_bug.cgi?id=%"; - $extList{"bzx"} = "http://bugzilla.mozilla.org/show_bug.cgi?id=%"; - - $prjExtension = "bz"; # Buffy hard-coded here. - - $Matricies{"dom-core"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html"; - $Matricies{"dom-html"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html"; - $Matricies{"domevents"} = "http://geckoqa.mcom.com/browser/standards/dom1/tcmatrix/index.html"; - $Matricies{"javascript"} = "http://geckoqa.mcom.com/browser/standards/javascript/tcmatrix/index.html"; - $Matricies{"forms"} = "http://geckoqa.mcom.com/browser/standards/form_submission/tcmatrix/index.html"; - $Matricies{"formsec"} = "http://geckoqa.mcom.com/browser/standards/form_submission/tcmatrix/index.html"; - - for (my $var = 0;$File{'SuiteList'}->[$var]->{'Name'};$var++) { - if (my $href = $Matrices{$File{'SuiteList'}->[$var]->{'Name'}}) { - $HTMLreport .= "
  • $File{'SuiteList'}->[$var]->{'Title'}
    • \n"; - } else { - $HTMLreport .= "
  • [$var]->{'Name'}\">$File{'SuiteList'}->[$var]->{'Title'}
    • \n"; + for (my $var = 0;$File{'SuiteList'}->[$var]->{'Name'};$var++) { + if (my $href = $Matrices{$File{'SuiteList'}->[$var]->{'Name'}}) { + $HTMLreport .= "
  • $File{'SuiteList'}->[$var]->{'Title'}
    • \n"; + } else { + $HTMLreport .= "
  • [$var]->{'Name'}\">$File{'SuiteList'}->[$var]->{'Title'}
    • \n"; + } } - } $HTMLreport .= <

    Test Result Summary:

    +END_PRINT + } # !express + + + $HTMLreport .= <   @@ -254,7 +273,10 @@ END_PRINT $pctFail +END_PRINT + unless ($express) { + $HTMLreport .= <Failed Testcases: END_PRINT @@ -283,7 +305,6 @@ END_PRINT ($none,$fName,$fDesc,$fStat,$fBug,$fExpected,$fActual) = split(/<->/,$curFile); $HTMLreport.= "{'Name'}/$fName\" target=\"_new\">$fName"; - # Quiet perl warnings about unused variables. my $tmp; $tmp = $fStat; $tmp = $fActual; $tmp = $fExpected; @@ -315,6 +336,7 @@ END_PRINT END_PRINT + } # !express 1; }