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.

llvm-svn: 14346
This commit is contained in:
Reid Spencer 2004-06-23 14:07:12 +00:00
parent 7971076728
commit 3c6901d00e

View File

@ -268,7 +268,7 @@ while (scalar(@ARGV) and ($_ = $ARGV[0], /^[-+]/)) {
if (/^-debug$/) { $DEBUG = 1; next; }
if (/^-nice$/) { $NICE = "nice "; 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; }
print "Unknown option: $_ : ignoring!\n";
@ -286,16 +286,6 @@ if (@ARGV == 3) {
$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";
#define the file names we'll use
@ -353,6 +343,16 @@ if (!$NOCHECKOUT) {
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...
if ( $VERBOSE ) { print "READING TEMPLATE\n"; }
my $TemplateContents = ReadFile $Template;