mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-19 06:31:18 +00:00
Changing the format dejagnu tests are submitted. We used to only submit multisource information for pass fail. Now we submit all pass/fail test information. This should fix the issue where some results were not being reported.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29757 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
5ea64fd9eb
commit
4b7f7aade1
@ -824,7 +824,7 @@ sub TestDirectory {
|
|||||||
# Create a list of the tests which were run...
|
# Create a list of the tests which were run...
|
||||||
#
|
#
|
||||||
system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
|
system "egrep 'TEST-(PASS|FAIL)' < $ProgramTestLog ".
|
||||||
"| sort > $Prefix-multisourceprogramstable.txt";
|
"| sort > $Prefix-$SubDir-Tests.txt";
|
||||||
}
|
}
|
||||||
$ProgramsTable = ReadFile "report.nightly.csv";
|
$ProgramsTable = ReadFile "report.nightly.csv";
|
||||||
|
|
||||||
@ -832,37 +832,47 @@ sub TestDirectory {
|
|||||||
return ($ProgramsTable, $llcbeta_options);
|
return ($ProgramsTable, $llcbeta_options);
|
||||||
} #end sub TestDirectory
|
} #end sub TestDirectory
|
||||||
|
|
||||||
|
##############################################################
|
||||||
|
#
|
||||||
|
# Calling sub TestDirectory
|
||||||
|
#
|
||||||
|
##############################################################
|
||||||
if (!$BuildError) {
|
if (!$BuildError) {
|
||||||
if ( $VERBOSE ) {
|
if ( $VERBOSE ) {
|
||||||
print "SingleSource TEST STAGE\n";
|
print "SingleSource TEST STAGE\n";
|
||||||
}
|
}
|
||||||
($SingleSourceProgramsTable, $llcbeta_options) =
|
($SingleSourceProgramsTable, $llcbeta_options) =
|
||||||
TestDirectory("SingleSource");
|
TestDirectory("SingleSource");
|
||||||
WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable;
|
WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
|
||||||
if ( $VERBOSE ) {
|
if ( $VERBOSE ) {
|
||||||
print "MultiSource TEST STAGE\n";
|
print "MultiSource TEST STAGE\n";
|
||||||
}
|
}
|
||||||
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
|
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
|
||||||
WriteFile "$Prefix-multisourceprogramstable.txt", $MultiSourceProgramsTable;
|
WriteFile "$Prefix-MultiSource-Performance.txt", $MultiSourceProgramsTable;
|
||||||
if ( ! $NOEXTERNALS ) {
|
if ( ! $NOEXTERNALS ) {
|
||||||
if ( $VERBOSE ) {
|
if ( $VERBOSE ) {
|
||||||
print "External TEST STAGE\n";
|
print "External TEST STAGE\n";
|
||||||
}
|
}
|
||||||
($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
|
($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
|
||||||
WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable;
|
WriteFile "$Prefix-External-Performance.txt", $ExternalProgramsTable;
|
||||||
system "cat $Prefix-singlesourceprogramstable.txt " .
|
system "cat $Prefix-SingleSource-Tests.txt " .
|
||||||
"$Prefix-multisourceprogramstable.txt ".
|
"$Prefix-MultiSource-Tests.txt ".
|
||||||
"$Prefix-externalprogramstable.txt | sort > $Prefix-Tests.txt";
|
"$Prefix-External-Tests.txt | sort > $Prefix-Tests.txt";
|
||||||
|
system "cat $Prefix-SingleSource-Performance.txt " .
|
||||||
|
"$Prefix-MultiSource-Performance.txt ".
|
||||||
|
"$Prefix-External-Performance.txt | sort > $Prefix-Performance.txt";
|
||||||
} else {
|
} else {
|
||||||
$ExternalProgramsTable = "External TEST STAGE SKIPPED\n";
|
$ExternalProgramsTable = "External TEST STAGE SKIPPED\n";
|
||||||
if ( $VERBOSE ) {
|
if ( $VERBOSE ) {
|
||||||
print "External TEST STAGE SKIPPED\n";
|
print "External TEST STAGE SKIPPED\n";
|
||||||
}
|
}
|
||||||
system "cat $Prefix-singlesourceprogramstable.txt " .
|
system "cat $Prefix-SingleSource-Tests.txt " .
|
||||||
"$Prefix-multisourceprogramstable.txt ".
|
"$Prefix-MultiSource-Tests.txt ".
|
||||||
" | sort > $Prefix-Tests.txt";
|
" | sort > $Prefix-Tests.txt";
|
||||||
|
system "cat $Prefix-SingleSource-Performance.txt " .
|
||||||
|
"$Prefix-MultiSource-Performance.txt ".
|
||||||
|
" | sort > $Prefix-Performance.txt";
|
||||||
}
|
}
|
||||||
WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
##############################################################
|
##############################################################
|
||||||
@ -872,9 +882,8 @@ if (!$BuildError) {
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
##############################################################
|
##############################################################
|
||||||
my $dejagnu = ReadFile $DejagnuSum;
|
my $dejagnu_test_list = ReadFile "$Prefix-Tests.txt";
|
||||||
my @DEJAGNU = split "\n", $dejagnu;
|
my @DEJAGNU = split "\n", $dejagnu_test_list;
|
||||||
my $dejagnu_test_list="";
|
|
||||||
|
|
||||||
my $passes="",
|
my $passes="",
|
||||||
my $fails="";
|
my $fails="";
|
||||||
@ -884,15 +893,12 @@ if(!$NODEJAGNU) {
|
|||||||
for ($x=0; $x<@DEJAGNU; $x++) {
|
for ($x=0; $x<@DEJAGNU; $x++) {
|
||||||
if ($DEJAGNU[$x] =~ m/^PASS:/) {
|
if ($DEJAGNU[$x] =~ m/^PASS:/) {
|
||||||
$passes.="$DEJAGNU[$x]\n";
|
$passes.="$DEJAGNU[$x]\n";
|
||||||
$dejagnu_test_list.="$DEJAGNU[$x]\n";
|
|
||||||
}
|
}
|
||||||
elsif ($DEJAGNU[$x] =~ m/^FAIL:/) {
|
elsif ($DEJAGNU[$x] =~ m/^FAIL:/) {
|
||||||
$fails.="$DEJAGNU[$x]\n";
|
$fails.="$DEJAGNU[$x]\n";
|
||||||
$dejagnu_test_list.="$DEJAGNU[$x]\n";
|
|
||||||
}
|
}
|
||||||
elsif ($DEJAGNU[$x] =~ m/^XFAIL:/) {
|
elsif ($DEJAGNU[$x] =~ m/^XFAIL:/) {
|
||||||
$xfails.="$DEJAGNU[$x]\n";
|
$xfails.="$DEJAGNU[$x]\n";
|
||||||
$dejagnu_test_list.="$DEJAGNU[$x]\n";
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -983,8 +989,6 @@ if ($GCCPATH ne "") {
|
|||||||
@GCC_VERSION = split '\n', $gcc_version_long;
|
@GCC_VERSION = split '\n', $gcc_version_long;
|
||||||
my $gcc_version = $GCC_VERSION[0];
|
my $gcc_version = $GCC_VERSION[0];
|
||||||
|
|
||||||
my $all_tests = ReadFile "$Prefix-Tests.txt";
|
|
||||||
|
|
||||||
##############################################################
|
##############################################################
|
||||||
#
|
#
|
||||||
# Send data via a post request
|
# Send data via a post request
|
||||||
|
Loading…
x
Reference in New Issue
Block a user