diff options
| author | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-01-28 21:09:50 +0000 |
|---|---|---|
| committer | Daniel Sanders <daniel.sanders@imgtec.com> | 2016-01-28 21:09:50 +0000 |
| commit | 508957013b3b7e9f8c8539070fd391429d863b67 (patch) | |
| tree | d8926f4db75935e855e136cb60eb1d3bdb099cea /utils/release | |
| parent | e26a9f0de48595065a5c16438e853a383067d773 (diff) | |
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
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@259094 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/release')
| -rwxr-xr-x | utils/release/test-release.sh | 26 |
1 files changed, 19 insertions, 7 deletions
diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index 81166d46ffd..8d71bc7dcbe 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -156,9 +156,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. @@ -203,9 +206,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 @@ -278,9 +283,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 |