From: Tom Stellard Date: Thu, 8 Jun 2017 21:31:59 +0000 (+0000) Subject: test-release.sh: Remove workaround for test-suite build X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e99f33afd94dae9983b65033f2c3bd7b9a4b44a9;p=llvm test-release.sh: Remove workaround for test-suite build Summary: We aren't actually building the test suite, so this isn't needed. Reviewers: rengolin, hansw Reviewed By: rengolin Subscribers: rengolin, llvm-commits Differential Revision: https://reviews.llvm.org/D29840 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@305017 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index b597d5f45ad..f5aa3ff0cd0 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -173,13 +173,6 @@ while [ $# -gt 0 ]; do shift done -if [ "$do_test_suite" = "yes" ]; then - # See llvm.org/PR26146. - echo Skipping test-suite build when using CMake. - echo It will still be exported. - do_test_suite="export-only" -fi - # Check required arguments. if [ -z "$Release" ]; then echo "error: no release number specified" @@ -315,11 +308,7 @@ function export_sources() { projsrc=llvm.src/projects/$proj ;; test-suite) - if [ $do_test_suite = 'yes' ]; then - projsrc=llvm.src/projects/$proj - else - projsrc=$proj.src - fi + projsrc=$proj.src ;; *) echo "error: unknown project $proj" @@ -417,6 +406,22 @@ function test_llvmCore() { deferred_error $Phase $Flavor "check-all failed" 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 + cmake $TestSuiteSrcDir -DTEST_SUITE_LIT=$Lit + if ! ( ${MAKE} -j $NumJobs -k check \ + 2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then + deferred_error $Phase $Flavor "test suite failed" + fi + fi cd $BuildDir }