) {
- if ( m/^--- TEST RESULTS/ ) { last; }
- }
# Process test results
- push(@lines,"TEST RESULTS
- \n");
my $first_list = 1;
my $should_break = 1;
my $nocopy = 0;
+ my $readingsum = 0;
while ( ) {
if ( length($_) > 1 ) {
chomp($_);
- if ( ! m/: PASS[ ]*$/ &&
- ! m/^ qmtest.target:/ &&
- ! m/^ local/ &&
- ! m/^gmake:/ ) {
- if ( m/: XFAIL/ ) {
- $nocopy = 1;
- } elsif ( m/: XPASS/ || m/: FAIL/ ) {
- $nocopy = 0;
- if ( $first_list ) {
- $first_list = 0;
- $should_break = 1;
- push(@lines,"$_
\n");
- } else {
- push(@lines," - $_
\n");
- }
- } elsif ( m/^--- STATISTICS/ ) {
- if ( $first_list ) { push(@lines,"PERFECT!"); }
- push(@lines,"
STATISTICS
\n");
- $should_break = 0;
- $nocopy = 0;
- } elsif ( m/^--- TESTS WITH/ ) {
+ if ( m/^XPASS:/ || m/^FAIL:/ ) {
+ $nocopy = 0;
+ if ( $first_list ) {
+ push(@lines, "UNEXPECTED TEST RESULTS
- \n");
+ $first_list = 0;
$should_break = 1;
- $first_list = 1;
- $nocopy = 0;
- push(@lines,"
TESTS WITH UNEXPECTED RESULTS
- \n");
- } elsif ( m/^real / ) {
- last;
- } elsif (!$nocopy) {
- if ( $should_break ) {
- push(@lines,"$_
\n");
- } else {
- push(@lines,"$_\n");
- }
+ push(@lines, "$_
\n");
+ print " $_\n";
+ } else {
+ push(@lines, " - $_
\n");
+ print " $_\n";
}
+ } elsif ( m/Summary/ ) {
+ if ( $first_list ) {
+ push(@lines, "PERFECT!");
+ print " PERFECT!\n";
+ } else {
+ push(@lines, "
\n");
+ }
+ push(@lines, "STATISTICS
\n");
+ print "\nDEJAGNU STATISTICS:\n";
+ $should_break = 0;
+ $nocopy = 0;
+ $readingsum = 1;
+ } elsif ( $readingsum ) {
+ push(@lines,"$_\n");
+ print " $_\n";
}
}
}
- close SRCHFILE;
}
- my $content = join("",@lines);
+ push(@lines, "\n");
+ close SRCHFILE;
+
+ my $content = join("", @lines);
return "$content\n";
-}
+}
#####################################################################
@@ -262,29 +263,33 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
# List command line options here...
if (/^-nocheckout$/) { $NOCHECKOUT = 1; next; }
- if (/^-noremove$/) { $NOREMOVE = 1; next; }
- if (/^-nofeaturetests$/) { $NOFEATURES = 1; next; }
- if (/^-noregressiontests$/){ $NOREGRESSIONS = 1; next; }
- if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
+ if (/^-noremove$/) { $NOREMOVE = 1; next; }
+ if (/^-notest$/) { $NOTEST = 1; $NORUNNINGTESTS = 1; next; }
if (/^-norunningtests$/) { $NORUNNINGTESTS = 1; next; }
- if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
- if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1"; next; }
+ if (/^-parallel$/) { $MAKEOPTS = "$MAKEOPTS -j2 -l3.0"; next; }
+ if (/^-release$/) { $MAKEOPTS = "$MAKEOPTS ENABLE_OPTIMIZED=1"; next; }
if (/^-pedantic$/) {
$MAKEOPTS = "$MAKEOPTS CompileOptimizeOpts='-O3 -DNDEBUG -finline-functions -Wpointer-arith -Wcast-align -Wno-deprecated -Wold-style-cast -Wabi -Woverloaded-virtual -ffor-scope'";
next;
}
- if (/^-enable-linscan$/) { $PROGTESTOPTS .= " ENABLE_LINEARSCAN=1"; next; }
+ if (/^-enable-llcbeta$/) { $PROGTESTOPTS .= " ENABLE_LLCBETA=1"; next; }
if (/^-disable-llc$/) { $PROGTESTOPTS .= " DISABLE_LLC=1";
$CONFIGUREARGS .= " --disable-llc_diffs"; next; }
if (/^-disable-jit$/) { $PROGTESTOPTS .= " DISABLE_JIT=1";
$CONFIGUREARGS .= " --disable-jit"; next; }
- if (/^-verbose$/) { $VERBOSE = 1; next; }
- if (/^-debug$/) { $DEBUG = 1; next; }
- if (/^-nice$/) { $NICE = "nice "; next; }
+ if (/^-verbose$/) { $VERBOSE = 1; next; }
+ if (/^-debug$/) { $DEBUG = 1; next; }
+ if (/^-nice$/) { $NICE = "nice "; next; }
+ if (/^-f2c$/) {
+ $CONFIGUREARGS .= " --with-f2c=$ARGV[0]"; shift; next;
+ }
if (/^-gnuplotscript$/) { $PlotScriptFilename = $ARGV[0]; shift; next; }
if (/^-templatefile$/) { $Template = $ARGV[0]; shift; next; }
- if (/^-gccpath/) { $CONFIGUREARGS=" CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; shift; next; }
+ if (/^-gccpath/) {
+ $CONFIGUREARGS .= " CC=$ARGV[0]/gcc CXX=$ARGV[0]/g++"; shift; next;
+ }
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
+ if(/^-nodejagnu$/) { $NODEJAGNU = 1; next; }
print "Unknown option: $_ : ignoring!\n";
}
@@ -309,12 +314,13 @@ my $Prefix = "$WebDir/$DATE";
#define the file names we'll use
my $BuildLog = "$Prefix-Build-Log.txt";
my $CVSLog = "$Prefix-CVS-Log.txt";
-my $FeatureTestsLog = "$Prefix-FeatureTests-Log.txt";
-my $RegressionTestsLog = "$Prefix-RegressionTests-Log.txt";
my $OldenTestsLog = "$Prefix-Olden-tests.txt";
my $SingleSourceLog = "$Prefix-SingleSource-ProgramTest.txt.gz";
my $MultiSourceLog = "$Prefix-MultiSource-ProgramTest.txt.gz";
my $ExternalLog = "$Prefix-External-ProgramTest.txt.gz";
+my $DejagnuLog = "$Prefix-Dejagnu-testrun.log";
+my $DejagnuSum = "$Prefix-Dejagnu-testrun.sum";
+my $DejagnuTestsLog = "$Prefix-DejagnuTests-Log.txt";
if ($VERBOSE) {
print "INITIALIZED\n";
@@ -408,7 +414,7 @@ if (!$NOCHECKOUT) {
my @Linked = split '\n', `grep Linking $BuildLog`;
my $NumExecutables = scalar(grep(/executable/, @Linked));
my $NumLibraries = scalar(grep(!/executable/, @Linked));
-my $NumObjects = `grep '^Compiling' $BuildLog | wc -l` + 0;
+my $NumObjects = `grep ']\: Compiling ' $BuildLog | wc -l` + 0;
my $ConfigTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$BuildLog";
my $ConfigTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$BuildLog";
@@ -420,66 +426,47 @@ my $BuildTimeS = GetRegexNum "^sys", 1, "([0-9.]+)", "$BuildLog";
my $BuildTime = $BuildTimeU+$BuildTimeS; # BuildTime = User+System
my $BuildWallTime = GetRegexNum "^real", 1, "([0-9.]+)","$BuildLog";
-my $BuildError = "";
+my $BuildError = 0, $BuildStatus = "OK";
if (`grep '^gmake[^:]*: .*Error' $BuildLog | wc -l` + 0 ||
`grep '^gmake: \*\*\*.*Stop.' $BuildLog | wc -l`+0) {
- $BuildError = "Build error: compilation " .
+ $BuildStatus = "error: compilation " .
"aborted
";
+ $BuildError = 1;
if ($VERBOSE) { print "BUILD ERROR\n"; }
}
-if ($BuildError) { $NOFEATURES = 1; $NOREGRESSIONS = 1; }
+if ($BuildError) { $NODEJAGNU=1; }
-# Get results of feature tests.
-my $FeatureTestResults; # String containing the results of the feature tests
-my $FeatureTime; # System+CPU Time for feature tests
-my $FeatureWallTime; # Wall Clock Time for feature tests
-if (!$NOFEATURES) {
- if ( $VERBOSE ) { print "FEATURE TEST STAGE\n"; }
- my $feature_output = "$FeatureTestsLog";
+my $DejangnuTestResults; # String containing the results of the dejagnu
+if(!$NODEJAGNU) {
+ if($VERBOSE) { print "DEJAGNU FEATURE/REGRESSION TEST STAGE\n"; }
+
+ my $dejagnu_output = "$DejagnuTestsLog";
+
+ #Run the feature and regression tests, results are put into testrun.sum
+ #Full log in testrun.log
+ system "(time -p gmake $MAKEOPTS check) > $dejagnu_output 2>&1";
- # Run the feature tests so we can summarize the results
- system "(time -p gmake $MAKEOPTS -C test Feature.t) > $feature_output 2>&1";
+ #Extract time of dejagnu tests
+ my $DejagnuTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$dejagnu_output";
+ my $DejagnuTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$dejagnu_output";
+ $DejagnuTime = $DejagnuTimeU+$DejagnuTimeS; # DejagnuTime = User+System
+ $DejagnuWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$dejagnu_output";
- # Extract test results
- $FeatureTestResults = GetQMTestResults("$feature_output");
+ #Copy the testrun.log and testrun.sum to our webdir
+ CopyFile("test/testrun.log", $DejagnuLog);
+ CopyFile("test/testrun.sum", $DejagnuSum);
- # Extract time of feature tests
- my $FeatureTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$feature_output";
- my $FeatureTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$feature_output";
- $FeatureTime = $FeatureTimeU+$FeatureTimeS; # FeatureTime = User+System
- $FeatureWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$feature_output";
- # Run the regression tests so we can summarize the results
-} else {
- $FeatureTestResults = "Skipped by user choice.";
- $FeatureTime = "0.0";
- $FeatureWallTime = "0.0";
-}
-
-if (!$NOREGRESSIONS) {
- if ( $VERBOSE ) { print "REGRESSION TEST STAGE\n"; }
- my $regression_output = "$RegressionTestsLog";
-
- # Run the regression tests so we can summarize the results
- system "(time -p gmake $MAKEOPTS -C test Regression.t) > $regression_output 2>&1";
+ $DejagnuTestResults = GetDejagnuTestResults($DejagnuSum, $DejagnuLog);
- # Extract test results
- $RegressionTestResults = GetQMTestResults("$regression_output");
-
- # Extract time of regressions tests
- my $RegressionTimeU = GetRegexNum "^user", 0, "([0-9.]+)", "$regression_output";
- my $RegressionTimeS = GetRegexNum "^sys", 0, "([0-9.]+)", "$regression_output";
- $RegressionTime = $RegressionTimeU+$RegressionTimeS; # RegressionTime = User+System
- $RegressionWallTime = GetRegexNum "^real", 0,"([0-9.]+)","$regression_output";
} else {
- $RegressionTestResults = "Skipped by user choice.";
- $RegressionTime = "0.0";
- $RegressionWallTime = "0.0";
+ $DejagnuTestResults = "Skipped by user choice.";
+ $DejagnuTime = "0.0";
+ $DejagnuWallTime = "0.0";
}
if ($DEBUG) {
- print $FeatureTestResults;
- print $RegressionTestResults;
+ print $DejagnuTestResults;
}
if ( $VERBOSE ) { print "BUILD INFORMATION COLLECTION STAGE\n"; }
@@ -559,8 +546,8 @@ foreach $File (@CVSHistory) {
}
}
-my $UserCommitList = join "\n", keys %UsersCommitted;
-my $UserUpdateList = join "\n", keys %UsersUpdated;
+my $UserCommitList = join "\n", sort keys %UsersCommitted;
+my $UserUpdateList = join "\n", sort keys %UsersUpdated;
my $AddedFilesList = AddPreTag join "\n", sort keys %AddedFiles;
my $ModifiedFilesList = AddPreTag join "\n", sort keys %ModifiedFiles;
my $RemovedFilesList = AddPreTag join "\n", sort keys %RemovedFiles;
@@ -614,7 +601,7 @@ sub TestDirectory {
}
# If we built the tree successfully, run the nightly programs tests...
-if ($BuildError eq "") {
+if (!$BuildError) {
if ( $VERBOSE ) {
print "SingleSource TEST STAGE\n";
}
@@ -631,6 +618,7 @@ if ($BuildError eq "") {
system "cat $Prefix-SingleSource-Tests.txt $Prefix-MultiSource-Tests.txt ".
" $Prefix-External-Tests.txt | sort > $Prefix-Tests.txt";
} else {
+ $ExternalProgramsTable = '| External TEST STAGE SKIPPED |
';
if ( $VERBOSE ) {
print "External TEST STAGE SKIPPED\n";
}
@@ -687,7 +675,7 @@ if ($TestError) {
# If we built the tree successfully, runs of the Olden suite with
# LARGE_PROBLEM_SIZE on so that we can get some "running" statistics.
-if ($BuildError eq "") {
+if (!$BuildError) {
if ( $VERBOSE ) { print "OLDEN TEST SUITE STAGE\n"; }
my ($NATTime, $CBETime, $LLCTime, $JITTime, $OptTime, $BytecodeSize,
$MachCodeSize) = ("","","","","","","");
@@ -698,9 +686,10 @@ if ($BuildError eq "") {
# Clean out previous results...
system "$NICE gmake $MAKEOPTS clean > /dev/null 2>&1";
- # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE enabled!
+ # Run the nightly test in this directory, with LARGE_PROBLEM_SIZE and
+ # GET_STABLE_NUMBERS enabled!
system "gmake -k $MAKEOPTS $PROGTESTOPTS report.nightly.raw.out TEST=nightly " .
- " LARGE_PROBLEM_SIZE=1 > /dev/null 2>&1";
+ " LARGE_PROBLEM_SIZE=1 GET_STABLE_NUMBERS=1 > /dev/null 2>&1";
system "cp report.nightly.raw.out $OldenTestsLog";
} else {
system "gunzip ${OldenTestsLog}.gz";
@@ -713,13 +702,13 @@ if ($BuildError eq "") {
# Loop over all of the records, summarizing them into rows for the running
# totals file.
- my $WallTimeRE = "[A-Za-z0-9.: ]+\\(([0-9.]+) wall clock";
+ my $WallTimeRE = "Time: ([0-9.]+) seconds \\([0-9.]+ wall clock";
foreach $Rec (@Records) {
- my $rNATTime = GetRegex 'TEST-RESULT-nat-time: real\s*([.0-9m]+)', $Rec;
- my $rCBETime = GetRegex 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)', $Rec;
- my $rLLCTime = GetRegex 'TEST-RESULT-llc-time: real\s*([.0-9m]+)', $Rec;
- my $rJITTime = GetRegex 'TEST-RESULT-jit-time: real\s*([.0-9m]+)', $Rec;
- my $rOptTime = GetRegex "TEST-RESULT-compile: $WallTimeRE", $Rec;
+ my $rNATTime = GetRegex 'TEST-RESULT-nat-time: program\s*([.0-9m]+)', $Rec;
+ my $rCBETime = GetRegex 'TEST-RESULT-cbe-time: program\s*([.0-9m]+)', $Rec;
+ my $rLLCTime = GetRegex 'TEST-RESULT-llc-time: program\s*([.0-9m]+)', $Rec;
+ my $rJITTime = GetRegex 'TEST-RESULT-jit-time: program\s*([.0-9m]+)', $Rec;
+ my $rOptTime = GetRegex "TEST-RESULT-compile: .*$WallTimeRE", $Rec;
my $rBytecodeSize = GetRegex 'TEST-RESULT-compile: *([0-9]+)', $Rec;
my $rMachCodeSize = GetRegex 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code', $Rec;
@@ -790,6 +779,18 @@ system ("$GNUPLOT", $PlotScriptFilename);
#
system ( "$NICE rm -rf $BuildDir") if (!$NOCHECKOUT and !$NOREMOVE);
+print "\nUSERS WHO COMMITTED:\n " . (join "\n ", sort keys %UsersCommitted) . "\n"
+ if (scalar %UsersCommitted);
+
+print "\nADDED FILES:\n " . (join "\n ", sort keys %AddedFiles) . "\n"
+ if (scalar %AddedFiles);
+
+print "\nCHANGED FILES:\n " . (join "\n ", sort keys %ModifiedFiles) . "\n"
+ if (scalar %ModifiedFiles);
+
+print "\nREMOVED FILES:\n " . (join "\n ", sort keys %RemovedFiles) . "\n"
+ if (scalar %RemovedFiles);
+
#
# Print out information...
#
@@ -798,17 +799,9 @@ if ($VERBOSE) {
print "CVS Checkout: $CVSCheckoutTime seconds\n";
print "Files/Dirs/LOC in CVS: $NumFilesInCVS/$NumDirsInCVS/$LOC\n";
print "Build Time: $BuildTime seconds\n";
- print "Feature Test Time: $FeatureTime seconds\n";
- print "Regression Test Time: $RegressionTime seconds\n";
print "Libraries/Executables/Objects built: $NumLibraries/$NumExecutables/$NumObjects\n";
print "WARNINGS:\n $WarningsList\n";
-
- print "Users committed: $UserCommitList\n";
- print "Added Files: \n $AddedFilesList\n";
- print "Modified Files: \n $ModifiedFilesList\n";
- print "Removed Files: \n $RemovedFilesList\n";
-
print "Previous Days =\n $PrevDaysList\n";
}
@@ -822,7 +815,8 @@ if ( $VERBOSE ) {
}
# Main HTML file...
my $Output;
-my $TestFinishTime = gmtime;
+my $TestFinishTime = gmtime() . " GMT
" . localtime() . " (local)";
+
my $TestPlatform = `uname -a`;
eval "\$Output = <