[llvm-branch-commits] [llvm-branch] r244117 - Merging r243898:

[Hans Wennborg]

Author: hans
Date: Wed Aug  5 15:45:06 2015
New Revision: 244117

URL: http://llvm.org/viewvc/llvm-project?rev=244117&view=rev
Log:
Merging r243898:
------------------------------------------------------------------------
r243898 | rengolin | 2015-08-03 13:19:35 -0700 (Mon, 03 Aug 2015) | 6 lines

[Release Script] Check for correct symlink name

While checking for the existence of the clang-tools-extra directory,
the script was not checking for its destination name, "extra", and
the script was failing when re-running without checking out new
sources.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_37/   (props changed)
    llvm/branches/release_37/utils/release/test-release.sh

Propchange: llvm/branches/release_37/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug  5 15:45:06 2015
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243984,243986
+/llvm/trunk:155241,242236,242239,242281,242288,242296,242331,242341,242410,242412,242433-242434,242442,242543,242673,242680,242706,242721-242722,242733-242735,242742,242869,242919,242993,243001,243057,243116,243263,243294,243361,243469,243485,243500,243519,243531,243589,243609,243636,243638-243640,243745,243898,243984,243986

Modified: llvm/branches/release_37/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_37/utils/release/test-release.sh?rev=244117&r1=244116&r2=244117&view=diff
==============================================================================
--- llvm/branches/release_37/utils/release/test-release.sh (original)
+++ llvm/branches/release_37/utils/release/test-release.sh Wed Aug  5 15:45:06 2015
@@ -267,7 +267,7 @@ function export_sources() {
         ln -s ../../cfe.src clang
     fi
     cd $BuildDir/llvm.src/tools/clang/tools
-    if [ ! -h clang-tools-extra ]; then
+    if [ ! -h extra ]; then
         ln -s ../../../../clang-tools-extra.src extra
     fi
     cd $BuildDir/llvm.src/projects