From: Patrick Jenkins Date: Wed, 19 Jul 2006 17:52:51 +0000 (+0000) Subject: Removed the portion that determines which tests are newly passing/failing because... X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=65c7ea035c0af8b0eae87ce284c9782b77ea37a3;p=oota-llvm.git Removed the portion that determines which tests are newly passing/failing because we no longer keep the previos days list on the testing machines. Added functionality to send lists of all tests, all passing tests, all failing tests all unexpected failing tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29209 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index bdc65aeab0c..78cf9537e83 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -798,7 +798,6 @@ if (!$BuildError && $patrickjenkins) { " | sort > $Prefix-Tests.txt"; } WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable; - } ############################################################## @@ -808,50 +807,69 @@ if (!$BuildError && $patrickjenkins) { # # ############################################################## -my ($TestsAdded, $TestsRemoved, $TestsFixed, $TestsBroken) = ("","","",""); - -if ($TestError) { - $TestsAdded = "error testing
"; - $TestsRemoved = "error testing
"; - $TestsFixed = "error testing
"; - $TestsBroken = "error testing
"; -} else { - my ($RTestsAdded, $RTestsRemoved) = DiffFiles "-Tests.txt"; - - my @RawTestsAddedArray = split '\n', $RTestsAdded; - my @RawTestsRemovedArray = split '\n', $RTestsRemoved; - - my %OldTests = map {GetRegex('TEST-....: (.+)', $_)=>$_} - @RawTestsRemovedArray; - my %NewTests = map {GetRegex('TEST-....: (.+)', $_)=>$_} - @RawTestsAddedArray; - - foreach $Test (keys %NewTests) { - if (!exists $OldTests{$Test}) { # TestAdded if in New but not old - $TestsAdded = "$TestsAdded$Test\n"; - } else { - if ($OldTests{$Test} =~ /TEST-PASS/) { # Was the old one a pass? - $TestsBroken = "$TestsBroken$Test\n"; # New one must be a failure - } else { - $TestsFixed = "$TestsFixed$Test\n"; # No, new one is a pass. - } - } - } - foreach $Test (keys %OldTests) { # TestRemoved if in Old but not New - $TestsRemoved = "$TestsRemoved$Test\n" if (!exists $NewTests{$Test}); - } +$dejagnu = ReadFile $DejagnuSum; +@DEJAGNU = split "\n", $dejagnu; - #print "\nTESTS ADDED: \n\n$TestsAdded\n\n" if (length $TestsAdded); - #print "\nTESTS REMOVED:\n\n$TestsRemoved\n\n" if (length $TestsRemoved); - #print "\nTESTS FIXED: \n\n$TestsFixed\n\n" if (length $TestsFixed); - #print "\nTESTS BROKEN: \n\n$TestsBroken\n\n" if (length $TestsBroken); +my $passes="", +my $fails=""; +my $xfails=""; - #$TestsAdded = AddPreTag $TestsAdded; - #$TestsRemoved = AddPreTag $TestsRemoved; - #$TestsFixed = AddPreTag $TestsFixed; - #$TestsBroken = AddPreTag $TestsBroken; +for($x=0; $x<@DEJAGNU; $x++){ + if($DEJAGNU[$x] =~ m/^PASS:/){ + $passes.="$x\n"; + } + elsif($DEJAGNU[$x] =~ m/^FAIL:/){ + $fails.="$x\n"; + } + elsif($DEJAGNU[$x] =~ m/^XFAIL:/){ + $xfails.="$x\n"; + } } +# my ($TestsAdded, $TestsRemoved, $TestsFixed, $TestsBroken) = ("","","",""); +# +# if ($TestError) { +# $TestsAdded = "error testing
"; +# $TestsRemoved = "error testing
"; +# $TestsFixed = "error testing
"; +# $TestsBroken = "error testing
"; +# } else { +# my ($RTestsAdded, $RTestsRemoved) = DiffFiles "-Tests.txt"; +# +# my @RawTestsAddedArray = split '\n', $RTestsAdded; +# my @RawTestsRemovedArray = split '\n', $RTestsRemoved; +# +# my %OldTests = map {GetRegex('TEST-....: (.+)', $_)=>$_} +# @RawTestsRemovedArray; +# my %NewTests = map {GetRegex('TEST-....: (.+)', $_)=>$_} +# @RawTestsAddedArray; +# +# foreach $Test (keys %NewTests) { +# if (!exists $OldTests{$Test}) { # TestAdded if in New but not old +# $TestsAdded = "$TestsAdded$Test\n"; +# } else { +# if ($OldTests{$Test} =~ /TEST-PASS/) { # Was the old one a pass? +# $TestsBroken = "$TestsBroken$Test\n"; # New one must be a failure +# } else { +# $TestsFixed = "$TestsFixed$Test\n"; # No, new one is a pass. +# } +# } +# } +# foreach $Test (keys %OldTests) { # TestRemoved if in Old but not New +# $TestsRemoved = "$TestsRemoved$Test\n" if (!exists $NewTests{$Test}); +# } +# +# #print "\nTESTS ADDED: \n\n$TestsAdded\n\n" if (length $TestsAdded); +# #print "\nTESTS REMOVED:\n\n$TestsRemoved\n\n" if (length $TestsRemoved); +# #print "\nTESTS FIXED: \n\n$TestsFixed\n\n" if (length $TestsFixed); +# #print "\nTESTS BROKEN: \n\n$TestsBroken\n\n" if (length $TestsBroken); +# +# #$TestsAdded = AddPreTag $TestsAdded; +# #$TestsRemoved = AddPreTag $TestsRemoved; +# #$TestsFixed = AddPreTag $TestsFixed; +# #$TestsBroken = AddPreTag $TestsBroken; +# } + ############################################################## # # If we built the tree successfully, runs of the Olden suite with @@ -961,7 +979,7 @@ my $dejagnulog_full; @DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog"; $dejagnulog_full = join("\n", @DEJAGNULOG_FULL); -my $gcc_version_long=""; +newmy $gcc_version_long=""; if($GCCPATH ne ""){ $gcc_version_long = `$GCCPATH/gcc --version`; print "$GCCPATH/gcc --version\n"; @@ -973,6 +991,8 @@ else{ @GCC_VERSION = split '\n', $gcc_version_long; my $gcc_version = $GCC_VERSION[0]; +$all_tests = ReadFile, "$Prefix-Tests.txt"; + ############################################################## # # Send data via a post request @@ -985,42 +1005,43 @@ if ( $VERBOSE ) { print "SEND THE DATA VIA THE POST REQUEST\n"; } my $host = "llvm.org"; my $file = "/nightlytest/NightlyTestAccept.cgi"; my %hash_of_data = ('machine_data' => $machine_data, - 'build_data' => $build_data, - 'gcc_version' => $gcc_version, - 'nickname' => $nickname, - 'dejagnutime_wall' => $DejagnuWallTime, - 'dejagnutime_cpu' => $DejagnuTime, - 'cvscheckouttime_wall' => $CVSCheckoutTime_Wall, - 'cvscheckouttime_cpu' => $CVSCheckoutTime_CPU, - 'configtime_wall' => $ConfigWallTime, - 'configtime_cpu'=> $ConfigTime, - 'buildtime_wall' => $BuildWallTime, - 'buildtime_cpu' => $BuildTime, - 'warnings' => $WarningsFile, - 'cvsusercommitlist' => $UserCommitList, - 'cvsuserupdatelist' => $UserUpdateList, - 'cvsaddedfiles' => $CVSAddedFiles, - 'cvsmodifiedfiles' => $CVSModifiedFiles, - 'cvsremovedfiles' => $CVSRemovedFiles, - 'lines_of_code' => $LOC, - 'cvs_file_count' => $NumFilesInCVS, - 'cvs_dir_count' => $NumDirsInCVS, - 'buildstatus' => $BuildStatus, - 'singlesource_programstable' => $SingleSourceProgramsTable, - 'multisource_programstable' => $MultiSourceProgramsTable, - 'externalsource_programstable' => $ExternalProgramsTable, - 'llcbeta_options' => $multisource_llcbeta_options, - 'warnings_removed' => $WarningsRemoved, - 'warnings_added' => $WarningsAdded, - 'newly_passing_tests' => $TestsFixed, - 'newly_failing_tests' => $TestsBroken, - 'new_tests' => $TestsAdded, - 'removed_tests' => $TestsRemoved, - 'unexpfail_tests' => $unexpfail_tests, - 'dejagnutests_log' => $dejagnutests_log, - 'dejagnutests_sum' => $dejagnutests_sum, - 'starttime' => $starttime, - 'endtime' => $endtime); + 'build_data' => $build_data, + 'gcc_version' => $gcc_version, + 'nickname' => $nickname, + 'dejagnutime_wall' => $DejagnuWallTime, + 'dejagnutime_cpu' => $DejagnuTime, + 'cvscheckouttime_wall' => $CVSCheckoutTime_Wall, + 'cvscheckouttime_cpu' => $CVSCheckoutTime_CPU, + 'configtime_wall' => $ConfigWallTime, + 'configtime_cpu'=> $ConfigTime, + 'buildtime_wall' => $BuildWallTime, + 'buildtime_cpu' => $BuildTime, + 'warnings' => $WarningsFile, + 'cvsusercommitlist' => $UserCommitList, + 'cvsuserupdatelist' => $UserUpdateList, + 'cvsaddedfiles' => $CVSAddedFiles, + 'cvsmodifiedfiles' => $CVSModifiedFiles, + 'cvsremovedfiles' => $CVSRemovedFiles, + 'lines_of_code' => $LOC, + 'cvs_file_count' => $NumFilesInCVS, + 'cvs_dir_count' => $NumDirsInCVS, + 'buildstatus' => $BuildStatus, + 'singlesource_programstable' => $SingleSourceProgramsTable, + 'multisource_programstable' => $MultiSourceProgramsTable, + 'externalsource_programstable' => $ExternalProgramsTable, + 'llcbeta_options' => $multisource_llcbeta_options, + 'warnings_removed' => $WarningsRemoved, + 'warnings_added' => $WarningsAdded, + 'passing_tests' => $passes, + 'expfail_tests' => $xfails, + 'unexpfail_tests' => $fails, + 'all_tests' => $all_tests, + 'new_tests' => "", + 'removed_tests' => "", + 'dejagnutests_log' => $dejagnutests_log, + 'dejagnutests_sum' => $dejagnutests_sum, + 'starttime' => $starttime, + 'endtime' => $endtime); $TESTING = 0;