mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2025-02-16 00:33:10 +00:00
Move the tests for readability of the template and gnuplot files so they
occur AFTER the source is checked out. This ensures that if either of the -gnuplotscript or -templatefile options are not given, that they get picked up from the checkout directory and don't abort the test unnecessarily. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@14346 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
1d914635f9
commit
c5b6705f04
@ -268,7 +268,7 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
|
|||||||
if (/^-debug$/) { $DEBUG = 1; next; }
|
if (/^-debug$/) { $DEBUG = 1; next; }
|
||||||
if (/^-nice$/) { $NICE = "nice "; next; }
|
if (/^-nice$/) { $NICE = "nice "; next; }
|
||||||
if (/^-gnuplotscript$/) { $PlotScriptFilename = $ARGV[0]; shift; next; }
|
if (/^-gnuplotscript$/) { $PlotScriptFilename = $ARGV[0]; shift; next; }
|
||||||
if (/^-templatefile$/) { $Template = $ARGV[0]; shift;; next; }
|
if (/^-templatefile$/) { $Template = $ARGV[0]; shift; next; }
|
||||||
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
|
if (/^-noexternals$/) { $NOEXTERNALS = 1; next; }
|
||||||
|
|
||||||
print "Unknown option: $_ : ignoring!\n";
|
print "Unknown option: $_ : ignoring!\n";
|
||||||
@ -286,16 +286,6 @@ if (@ARGV == 3) {
|
|||||||
$WebDir = $ARGV[2];
|
$WebDir = $ARGV[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( $Template eq "" ) {
|
|
||||||
$Template = "$BuildDir/llvm/utils/NightlyTestTemplate.html";
|
|
||||||
}
|
|
||||||
die "Template file $Template is not readable" if ( ! -r "$Template" );
|
|
||||||
|
|
||||||
if ( $PlotScriptFilename eq "" ) {
|
|
||||||
$PlotScriptFilename = "$BuildDir/llvm/utils/NightlyTest.gnuplot";
|
|
||||||
}
|
|
||||||
die "GNUPlot Script $PlotScriptFilename is not readable" if ( ! -r "$PlotScriptFilename" );
|
|
||||||
|
|
||||||
my $Prefix = "$WebDir/$DATE";
|
my $Prefix = "$WebDir/$DATE";
|
||||||
|
|
||||||
#define the file names we'll use
|
#define the file names we'll use
|
||||||
@ -353,6 +343,16 @@ if (!$NOCHECKOUT) {
|
|||||||
system "$NICE cvs update -P -d >> $CVSLog 2>&1" ;
|
system "$NICE cvs update -P -d >> $CVSLog 2>&1" ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( $Template eq "" ) {
|
||||||
|
$Template = "$BuildDir/llvm/utils/NightlyTestTemplate.html";
|
||||||
|
}
|
||||||
|
die "Template file $Template is not readable" if ( ! -r "$Template" );
|
||||||
|
|
||||||
|
if ( $PlotScriptFilename eq "" ) {
|
||||||
|
$PlotScriptFilename = "$BuildDir/llvm/utils/NightlyTest.gnuplot";
|
||||||
|
}
|
||||||
|
die "GNUPlot Script $PlotScriptFilename is not readable" if ( ! -r "$PlotScriptFilename" );
|
||||||
|
|
||||||
# Read in the HTML template file...
|
# Read in the HTML template file...
|
||||||
if ( $VERBOSE ) { print "READING TEMPLATE\n"; }
|
if ( $VERBOSE ) { print "READING TEMPLATE\n"; }
|
||||||
my $TemplateContents = ReadFile $Template;
|
my $TemplateContents = ReadFile $Template;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user