From 0313775225942926ca561909c5c11be7a54b67a3 Mon Sep 17 00:00:00 2001 From: Patrick Jenkins Date: Mon, 21 Aug 2006 20:45:57 +0000 Subject: [PATCH] The new nightly tester should stop outputing a message stating the testresults directory is not present unless the script is run as verbose. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29797 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/NewNightlyTest.pl | 42 +++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index feae7abed49..db78195a9c8 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -227,7 +227,9 @@ my $DejagnuSum = "$Prefix-Dejagnu-testrun.sum"; my $DejagnuTestsLog = "$Prefix-DejagnuTests-Log.txt"; if (! -d $WebDir) { mkdir $WebDir, 0777; - warn "$WebDir did not exist; creating it.\n"; + if($VERBOSE){ + warn "$WebDir did not exist; creating it.\n"; + } } if ($VERBOSE) { @@ -941,28 +943,28 @@ my $build_data; @BUILD_DATA = ReadFile "$BuildLog"; $build_data = join("\n", @BUILD_DATA); -my @DEJAGNU_LOG; -my @DEJAGNU_SUM; -my $dejagnutests_log; -my $dejagnutests_sum; -@DEJAGNU_LOG = ReadFile "$DejagnuLog"; -@DEJAGNU_SUM = ReadFile "$DejagnuSum"; -$dejagnutests_log = join("\n", @DEJAGNU_LOG); -$dejagnutests_sum = join("\n", @DEJAGNU_SUM); +my (@DEJAGNU_LOG, @DEJAGNU_SUM, @DEJAGNULOG_FULL, @GCC_VERSION); +my ($dejagnutests_log ,$dejagnutests_sum, $dejagnulog_full) = ""; +my ($gcc_version, $gcc_version_long) = ""; -my @DEJAGNULOG_FULL; -my $dejagnulog_full; -@DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog"; -$dejagnulog_full = join("\n", @DEJAGNULOG_FULL); +if(!$BuildError){ + @DEJAGNU_LOG = ReadFile "$DejagnuLog"; + @DEJAGNU_SUM = ReadFile "$DejagnuSum"; + $dejagnutests_log = join("\n", @DEJAGNU_LOG); + $dejagnutests_sum = join("\n", @DEJAGNU_SUM); -my $gcc_version_long=""; -if ($GCCPATH ne "") { - $gcc_version_long = `$GCCPATH/gcc --version`; -} else { - $gcc_version_long = `gcc --version`; + @DEJAGNULOG_FULL = ReadFile "$DejagnuTestsLog"; + $dejagnulog_full = join("\n", @DEJAGNULOG_FULL); + + $gcc_version_long=""; + if ($GCCPATH ne "") { + $gcc_version_long = `$GCCPATH/gcc --version`; + } else { + $gcc_version_long = `gcc --version`; + } + @GCC_VERSION = split '\n', $gcc_version_long; + $gcc_version = $GCC_VERSION[0]; } -@GCC_VERSION = split '\n', $gcc_version_long; -my $gcc_version = $GCC_VERSION[0]; ############################################################## #