mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-10-06 14:57:41 +00:00
NewNightlyTest: Pull most VERBOSE handling into RunLoggedCommand function.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74256 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
0f05d22a31
commit
fc0fc3aedb
@ -304,9 +304,18 @@ sub GetDir {
|
|||||||
sub RunLoggedCommand {
|
sub RunLoggedCommand {
|
||||||
my $Command = shift;
|
my $Command = shift;
|
||||||
my $Log = shift;
|
my $Log = shift;
|
||||||
|
my $Title = shift;
|
||||||
if ($TEELOGS) {
|
if ($TEELOGS) {
|
||||||
|
if ($VERBOSE) {
|
||||||
|
print "$Title\n";
|
||||||
|
print "$Command 2>&1 | tee $Log\n";
|
||||||
|
}
|
||||||
system "$Command 2>&1 | tee $Log";
|
system "$Command 2>&1 | tee $Log";
|
||||||
} else {
|
} else {
|
||||||
|
if ($VERBOSE) {
|
||||||
|
print "$Title\n";
|
||||||
|
print "$Command 2>&1 > $Log\n";
|
||||||
|
}
|
||||||
system "$Command 2>&1 > $Log";
|
system "$Command 2>&1 > $Log";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -314,10 +323,19 @@ sub RunLoggedCommand {
|
|||||||
sub RunAppendingLoggedCommand {
|
sub RunAppendingLoggedCommand {
|
||||||
my $Command = shift;
|
my $Command = shift;
|
||||||
my $Log = shift;
|
my $Log = shift;
|
||||||
|
my $Title = shift;
|
||||||
if ($TEELOGS) {
|
if ($TEELOGS) {
|
||||||
|
if ($VERBOSE) {
|
||||||
|
print "$Title\n";
|
||||||
|
print "$Command 2>&1 | tee -a $Log\n";
|
||||||
|
}
|
||||||
system "$Command 2>&1 | tee -a $Log";
|
system "$Command 2>&1 | tee -a $Log";
|
||||||
} else {
|
} else {
|
||||||
system "$Command 2>&1 > $Log";
|
if ($VERBOSE) {
|
||||||
|
print "$Title\n";
|
||||||
|
print "$Command 2>&1 > $Log\n";
|
||||||
|
}
|
||||||
|
system "$Command 2>&1 >> $Log";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -565,34 +583,25 @@ if (!$NOCHECKOUT) {
|
|||||||
##############################################################
|
##############################################################
|
||||||
if (!$NOCHECKOUT) {
|
if (!$NOCHECKOUT) {
|
||||||
ChangeDir( $BuildDir, "checkout directory" );
|
ChangeDir( $BuildDir, "checkout directory" );
|
||||||
if ( $VERBOSE ) { print "CHECKOUT STAGE:\n"; }
|
|
||||||
if ($USESVN) {
|
if ($USESVN) {
|
||||||
my $SVNCMD = "$NICE svn co --non-interactive $SVNURL";
|
my $SVNCMD = "$NICE svn co --non-interactive $SVNURL";
|
||||||
my $SVNCMD2 = "$NICE svn co --non-interactive $TestSVNURL";
|
my $SVNCMD2 = "$NICE svn co --non-interactive $TestSVNURL";
|
||||||
if ($VERBOSE) {
|
|
||||||
print "( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .
|
|
||||||
"$SVNCMD2/test-suite/trunk llvm-test ) > $COLog 2>&1\n";
|
|
||||||
}
|
|
||||||
RunLoggedCommand("( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .
|
RunLoggedCommand("( time -p $SVNCMD/llvm/trunk llvm; cd llvm/projects ; " .
|
||||||
"$SVNCMD2/test-suite/trunk llvm-test )", $COLog);
|
"$SVNCMD2/test-suite/trunk llvm-test )", $COLog,
|
||||||
|
"CHECKOUT LLVM");
|
||||||
if ($WITHCLANG) {
|
if ($WITHCLANG) {
|
||||||
my $SVNCMD = "$NICE svn co --non-interactive $SVNURL/cfe/trunk";
|
my $SVNCMD = "$NICE svn co --non-interactive $SVNURL/cfe/trunk";
|
||||||
if ($VERBOSE) {
|
RunLoggedCommand("( time -p cd llvm/tools ; $SVNCMD clang )", $COLog,
|
||||||
print "( time -p cd llvm/tools ; $SVNCMD clang ) > $COLog 2>&1\n";
|
"CHECKOUT CLANG");
|
||||||
}
|
|
||||||
RunLoggedCommand("( time -p cd llvm/tools ; $SVNCMD clang )", $COLog);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
my $CVSOPT = "";
|
my $CVSOPT = "";
|
||||||
$CVSOPT = "-z3" # Use compression if going over ssh.
|
$CVSOPT = "-z3" # Use compression if going over ssh.
|
||||||
if $CVSRootDir =~ /^:ext:/;
|
if $CVSRootDir =~ /^:ext:/;
|
||||||
my $CVSCMD = "$NICE cvs $CVSOPT -d $CVSRootDir co -P $CVSCOOPT";
|
my $CVSCMD = "$NICE cvs $CVSOPT -d $CVSRootDir co -P $CVSCOOPT";
|
||||||
if ($VERBOSE) {
|
|
||||||
print "( time -p $CVSCMD llvm; cd llvm/projects ; " .
|
|
||||||
"$CVSCMD llvm-test ) > $COLog 2>&1\n";
|
|
||||||
}
|
|
||||||
RunLoggedCommand("( time -p $CVSCMD llvm; cd llvm/projects ; " .
|
RunLoggedCommand("( time -p $CVSCMD llvm; cd llvm/projects ; " .
|
||||||
"$CVSCMD llvm-test )", $COLog);
|
"$CVSCMD llvm-test )", $COLog,
|
||||||
|
"CHECKOUT LLVM-TEST");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ChangeDir( $LLVMSrcDir , "llvm source directory") ;
|
ChangeDir( $LLVMSrcDir , "llvm source directory") ;
|
||||||
@ -748,21 +757,11 @@ my $UserUpdateList = join "\n", sort keys %UsersUpdated;
|
|||||||
##############################################################
|
##############################################################
|
||||||
if (!$NOCHECKOUT && !$NOBUILD) {
|
if (!$NOCHECKOUT && !$NOBUILD) {
|
||||||
my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
|
my $EXTRAFLAGS = "--enable-spec --with-objroot=.";
|
||||||
if ( $VERBOSE ) {
|
|
||||||
print "CONFIGURE STAGE:\n";
|
|
||||||
print "(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) " .
|
|
||||||
"> $BuildLog 2>&1\n";
|
|
||||||
}
|
|
||||||
RunLoggedCommand("(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) ",
|
RunLoggedCommand("(time -p $NICE ./configure $CONFIGUREARGS $EXTRAFLAGS) ",
|
||||||
$BuildLog);
|
$BuildLog, "CONFIGURE");
|
||||||
if ( $VERBOSE ) {
|
|
||||||
print "BUILD STAGE:\n";
|
|
||||||
print "(time -p $NICE $MAKECMD clean) >> $BuildLog 2>&1\n";
|
|
||||||
print "(time -p $NICE $MAKECMD $MAKEOPTS) >> $BuildLog 2>&1\n";
|
|
||||||
}
|
|
||||||
# Build the entire tree, capturing the output into $BuildLog
|
# Build the entire tree, capturing the output into $BuildLog
|
||||||
RunAppendingLoggedCommand("(time -p $NICE $MAKECMD clean)", $BuildLog);
|
RunAppendingLoggedCommand("(time -p $NICE $MAKECMD clean)", $BuildLog, "BUILD CLEAN");
|
||||||
RunAppendingLoggedCommand("(time -p $NICE $MAKECMD $MAKEOPTS)", $BuildLog);
|
RunAppendingLoggedCommand("(time -p $NICE $MAKECMD $MAKEOPTS)", $BuildLog, "BUILD");
|
||||||
}
|
}
|
||||||
|
|
||||||
##############################################################
|
##############################################################
|
||||||
@ -842,14 +841,9 @@ if (!$BuildError) {
|
|||||||
my $DejangnuTestResults=""; # String containing the results of the dejagnu
|
my $DejangnuTestResults=""; # String containing the results of the dejagnu
|
||||||
my $dejagnu_output = "$DejagnuTestsLog";
|
my $dejagnu_output = "$DejagnuTestsLog";
|
||||||
if (!$NODEJAGNU) {
|
if (!$NODEJAGNU) {
|
||||||
if($VERBOSE) {
|
|
||||||
print "DEJAGNU FEATURE/REGRESSION TEST STAGE:\n";
|
|
||||||
print "(time -p $MAKECMD $MAKEOPTS check) > $dejagnu_output 2>&1\n";
|
|
||||||
}
|
|
||||||
|
|
||||||
#Run the feature and regression tests, results are put into testrun.sum
|
#Run the feature and regression tests, results are put into testrun.sum
|
||||||
#Full log in testrun.log
|
#Full log in testrun.log
|
||||||
RunLoggedCommand("(time -p $MAKECMD $MAKEOPTS check)", $dejagnu_output);
|
RunLoggedCommand("(time -p $MAKECMD $MAKEOPTS check)", $dejagnu_output, "DEJAGNU");
|
||||||
|
|
||||||
#Copy the testrun.log and testrun.sum to our webdir
|
#Copy the testrun.log and testrun.sum to our webdir
|
||||||
CopyFile("test/testrun.log", $DejagnuLog);
|
CopyFile("test/testrun.log", $DejagnuLog);
|
||||||
@ -928,7 +922,7 @@ sub TestDirectory {
|
|||||||
"TEST=nightly > $ProgramTestLog 2>&1\n";
|
"TEST=nightly > $ProgramTestLog 2>&1\n";
|
||||||
}
|
}
|
||||||
RunLoggedCommand("$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv ".
|
RunLoggedCommand("$MAKECMD -k $MAKEOPTS $PROGTESTOPTS report.nightly.csv ".
|
||||||
"TEST=nightly", $ProgramTestLog);
|
"TEST=nightly", $ProgramTestLog, "TEST DIRECTORY $SubDir");
|
||||||
$llcbeta_options=`$MAKECMD print-llcbeta-option`;
|
$llcbeta_options=`$MAKECMD print-llcbeta-option`;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -961,21 +955,12 @@ sub TestDirectory {
|
|||||||
#
|
#
|
||||||
##############################################################
|
##############################################################
|
||||||
if (!$BuildError) {
|
if (!$BuildError) {
|
||||||
if ( $VERBOSE ) {
|
|
||||||
print "SingleSource TEST STAGE\n";
|
|
||||||
}
|
|
||||||
($SingleSourceProgramsTable, $llcbeta_options) =
|
($SingleSourceProgramsTable, $llcbeta_options) =
|
||||||
TestDirectory("SingleSource");
|
TestDirectory("SingleSource");
|
||||||
WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
|
WriteFile "$Prefix-SingleSource-Performance.txt", $SingleSourceProgramsTable;
|
||||||
if ( $VERBOSE ) {
|
|
||||||
print "MultiSource TEST STAGE\n";
|
|
||||||
}
|
|
||||||
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
|
($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource");
|
||||||
WriteFile "$Prefix-MultiSource-Performance.txt", $MultiSourceProgramsTable;
|
WriteFile "$Prefix-MultiSource-Performance.txt", $MultiSourceProgramsTable;
|
||||||
if ( ! $NOEXTERNALS ) {
|
if ( ! $NOEXTERNALS ) {
|
||||||
if ( $VERBOSE ) {
|
|
||||||
print "External TEST STAGE\n";
|
|
||||||
}
|
|
||||||
($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
|
($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External");
|
||||||
WriteFile "$Prefix-External-Performance.txt", $ExternalProgramsTable;
|
WriteFile "$Prefix-External-Performance.txt", $ExternalProgramsTable;
|
||||||
system "cat $Prefix-SingleSource-Tests.txt " .
|
system "cat $Prefix-SingleSource-Tests.txt " .
|
||||||
|
Loading…
Reference in New Issue
Block a user