[llvm] r310939 - test-release.sh: Move test-suite setup to beginning of the script

[Hans Wennborg via llvm-commits]

Merged to 5.0 in r311094.

On Tue, Aug 15, 2017 at 11:11 AM, Tom Stellard via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: tstellar
> Date: Tue Aug 15 11:11:56 2017
> New Revision: 310939
>
> URL: http://llvm.org/viewvc/llvm-project?rev=310939&view=rev
> Log:
> 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
>
> Modified:
>     llvm/trunk/utils/release/test-release.sh
>
> Modified: llvm/trunk/utils/release/test-release.sh
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/test-release.sh?rev=310939&r1=310938&r2=310939&view=diff
> ==============================================================================
> --- llvm/trunk/utils/release/test-release.sh (original)
> +++ llvm/trunk/utils/release/test-release.sh Tue Aug 15 11:11:56 2017
> @@ -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
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits