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
diff --git a/utils/NightlyTest.pl b/utils/NightlyTest.pl
index 7884a6a..67da24f 100755
--- a/utils/NightlyTest.pl
+++ b/utils/NightlyTest.pl
@@ -268,7 +268,7 @@
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 @@
$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 @@
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;