From c281b0d9a4df804f479cf5e2c4df0ca15a5611c0 Mon Sep 17 00:00:00 2001 From: Patrick Jenkins Date: Thu, 27 Jul 2006 19:00:01 +0000 Subject: [PATCH] Added more descriptive output to singlesource,multisource tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@29353 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/NewNightlyTest.pl | 56 +++++++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/utils/NewNightlyTest.pl b/utils/NewNightlyTest.pl index 805947a8753..302009124dd 100755 --- a/utils/NewNightlyTest.pl +++ b/utils/NewNightlyTest.pl @@ -819,34 +819,40 @@ sub TestDirectory { return ($ProgramsTable, $llcbeta_options); } -if (!$BuildError && $patrickjenkins) { - if ( $VERBOSE ) { - print "SingleSource TEST STAGE\n"; - } - ($SingleSourceProgramsTable, $llcbeta_options) = TestDirectory("SingleSource"); - WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable; - if ( $VERBOSE ) { - print "MultiSource TEST STAGE\n"; - } - ($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource"); - WriteFile "$Prefix-multisourceprogramstable.txt", $MultiSourceProgramsTable; - if ( ! $NOEXTERNALS ) { +if (!$BuildError) { if ( $VERBOSE ) { - print "External TEST STAGE\n"; + print "SingleSource TEST STAGE\n"; + } + ($SingleSourceProgramsTable, $llcbeta_options) = TestDirectory("SingleSource"); + if ( $VERBOSE ) { + print "SingleSource returned $SingleSourceProgramsTable\n"; + } + WriteFile "$Prefix-singlesourceprogramstable.txt", $SingleSourceProgramsTable; + if ( $VERBOSE ) { + print "MultiSource TEST STAGE\n"; + } + ($MultiSourceProgramsTable, $llcbeta_options) = TestDirectory("MultiSource"); + WriteFile "$Prefix-multisourceprogramstable.txt", $MultiSourceProgramsTable; + if ( $VERBOSE ) { + print "MultiSource returned $MultiSourceProgramsTable\n"; + } + if ( ! $NOEXTERNALS ) { + if ( $VERBOSE ) { + print "External TEST STAGE\n"; + } + ($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External"); + WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable; + system "cat $Prefix-singlesourceprogramstable.txt $Prefix-multisourceprogramstable.txt ". + " $Prefix-externalprogramstable.txt | sort > $Prefix-Tests.txt"; + } else { + $ExternalProgramsTable = "External TEST STAGE SKIPPED\n"; + if ( $VERBOSE ) { + print "External TEST STAGE SKIPPED\n"; + } + system "cat $Prefix-singlesourceprogramstable.txt $Prefix-multisourceprogramstable.txt ". + " | sort > $Prefix-Tests.txt"; } - ($ExternalProgramsTable, $llcbeta_options) = TestDirectory("External"); WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable; - system "cat $Prefix-singlesourceprogramstable.txt $Prefix-multisourceprogramstable.txt ". - " $Prefix-externalprogramstable.txt | sort > $Prefix-Tests.txt"; - } else { - $ExternalProgramsTable = "External TEST STAGE SKIPPED\n"; - if ( $VERBOSE ) { - print "External TEST STAGE SKIPPED\n"; - } - system "cat $Prefix-singlesourceprogramstable.txt $Prefix-multisourceprogramstable.txt ". - " | sort > $Prefix-Tests.txt"; - } - WriteFile "$Prefix-externalprogramstable.txt", $ExternalProgramsTable; } ##############################################################