Author: dsanders Date: Thu Jan 28 15:05:40 2016 New Revision: 259093 URL: http://llvm.org/viewvc/llvm-project?rev=259093&view=rev Log: Bring back the test-suite export in test-release without bringing back the build failures.
Summary: r257791 disabled the test-suite export since the addition of CMakeLists.txt was causing build failures. This patch exports the test-suite again but does so outside the source tree so that it isn't included in the Phase[123] builds. Reviewers: hans Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D16679 Modified: llvm/branches/release_38/utils/release/test-release.sh Modified: llvm/branches/release_38/utils/release/test-release.sh URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_38/utils/release/test-release.sh?rev=259093&r1=259092&r2=259093&view=diff ============================================================================== --- llvm/branches/release_38/utils/release/test-release.sh (original) +++ llvm/branches/release_38/utils/release/test-release.sh Thu Jan 28 15:05:40 2016 @@ -155,9 +155,12 @@ while [ $# -gt 0 ]; do done if [ "$use_autoconf" = "no" ]; then - # See llvm.org/PR26146. - echo Skipping test-suite when using CMake. - do_test_suite="no" + 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 fi # Check required arguments. @@ -202,9 +205,11 @@ if [ $do_libs = "yes" ]; then projects="$projects libunwind" fi fi -if [ $do_test_suite = "yes" ]; then - projects="$projects test-suite" -fi +case $do_test_suite in + yes|export-only) + projects="$projects test-suite" + ;; +esac if [ $do_openmp = "yes" ]; then projects="$projects openmp" fi @@ -277,9 +282,16 @@ function export_sources() { clang-tools-extra) projsrc=llvm.src/tools/clang/tools/extra ;; - compiler-rt|libcxx|libcxxabi|libunwind|openmp|test-suite) + compiler-rt|libcxx|libcxxabi|libunwind|openmp) projsrc=llvm.src/projects/$proj ;; + test-suite) + if [ $do_test_suite = 'yes' ]; then + projsrc=llvm.src/projects/$proj + else + projsrc=$proj.src + fi + ;; *) echo "error: unknown project $proj" exit 1 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
