From 4c0245450c08bb35141911eee74a1a9c3d21d7af Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 15 Aug 2017 18:11:56 +0000 Subject: [PATCH] test-release.sh: Move test-suite setup to beginning of the script Summary: We want to catch failures early before do the full 3 stage build. The goal here is to avoid running through the whole build process and have it fail at the end (and not create the binary packages), just because some prerequisites failed to install. Reviewers: rovka, hans Reviewed By: hans Subscribers: llvm-commits Differential Revision: https://reviews.llvm.org/D36422 llvm-svn: 310939 --- utils/release/test-release.sh | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index 02d8e7925f6..66a2c578083 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -403,14 +403,6 @@ function test_llvmCore() { fi if [ $do_test_suite = 'yes' ]; then - SandboxDir="$BuildDir/sandbox" - Lit=$SandboxDir/bin/lit - TestSuiteBuildDir="$BuildDir/test-suite-build" - TestSuiteSrcDir="$BuildDir/test-suite.src" - - virtualenv $SandboxDir - $SandboxDir/bin/python $BuildDir/llvm.src/utils/lit/setup.py install - mkdir -p $TestSuiteBuildDir cd $TestSuiteBuildDir env CC="$c_compiler" CXX="$cxx_compiler" \ cmake $TestSuiteSrcDir -DTEST_SUITE_LIT=$Lit @@ -466,6 +458,19 @@ if [ "$do_checkout" = "yes" ]; then export_sources fi +# Setup the test-suite. Do this early so we can catch failures before +# we do the full 3 stage build. +if [ $do_test_suite = "yes" ]; then + SandboxDir="$BuildDir/sandbox" + Lit=$SandboxDir/bin/lit + TestSuiteBuildDir="$BuildDir/test-suite-build" + TestSuiteSrcDir="$BuildDir/test-suite.src" + + virtualenv $SandboxDir + $SandboxDir/bin/python $BuildDir/llvm.src/utils/lit/setup.py install + mkdir -p $TestSuiteBuildDir +fi + ( Flavors="Release" if [ "$do_debug" = "yes" ]; then