test-release.sh: Add ability to do a test build using the trunk or branches.

[dsanders]

Summary

Adds --test-trunk and '--test-branch BRANCH' that causes the script to export
the trunk or the specified branch. Otherwise the tag specified by -release, -rc,
etc. will be used. The version portion of the package name will be 'test-trunk'
or 'test-$branch' (any forward slashes in the branch name are replaced with
underscores), for example:

clang+llvm-test-branches_release_35-mips-linux-gnu.tar.xz

This is primarily useful for bringing new release packages up to standard
without needing to create and maintain a tag for the purpose.

[dsanders]

Update to 3.7 with D10715 applied since there's no 3.7.0rc1 tag yet

[hans]

Thanks! This seems useful.

release/test-release.sh

97 ↗

(On Diff #29761)

I wonder if we could make this simpler by adding just one command-line option, so one could run the script for example like:

./test-relese.sh -svn-path trunk
or
./test-release.sh -svn-path branches/release_37

And that would get baked into the package name. What do you think?

[dsanders]

release/test-release.sh

97 ↗

(On Diff #29761)

I don't mind merging them into one option. The reason they're separate is merely that this was originally two patches.

'-test-branch trunk' should already work for testing the trunk so it's a fairly minor change.

[dsanders]

Merged -test-branch and -test-trunk into -svn-path

[hans]

Thanks! Looks good to me.

release/test-release.sh

207 ↗

(On Diff #29894)

This error message should probably include the $ExportBranch now to be more useful.

llvm/trunk/utils/release/test-release.sh

 use_gzip="no"
 do_checkout="yes"
 do_debug="no"
 do_asserts="no"
 do_compare="yes"
 BuildDir="`pwd`"
 use_autoconf="no"
 ExtraConfigureFlags=""
+ExportBranch=""
 
 function usage() {
     echo "usage: `basename $0` -release X.Y.Z -rc NUM [OPTIONS]"
     echo ""
     echo " -release X.Y.Z       The release version to test."
     echo " -rc NUM              The pre-release candidate number."
     echo " -final               The final release candidate."
     echo " -triple TRIPLE       The target triple for this machine."
     echo " -j NUM               Number of compile jobs to run. [default: 3]"
     echo " -build-dir DIR       Directory to perform testing in. [default: pwd]"
     echo " -no-checkout         Don't checkout the sources from SVN."
     echo " -test-debug          Test the debug build. [default: no]"
     echo " -test-asserts        Test with asserts on. [default: no]"
     echo " -no-compare-files    Don't test that phase 2 and 3 files are identical."
     echo " -use-gzip            Use gzip instead of xz."
     echo " -configure-flags FLAGS  Extra flags to pass to the configure step."
     echo " -use-autoconf        Use autoconf instead of cmake"
+    echo " -svn-path DIR        Use the specified DIR instead of a release."
+    echo "                      For example -svn-path trunk or -svn-path branches/release_37"
 }
 
 if [ `uname -s` = "Darwin" ]; then
   # compiler-rt doesn't yet build with CMake on Darwin.
   use_autoconf="yes"
 fi
 
 while [ $# -gt 0 ]; do
     case $1 in
         -release | --release )
             shift
             Release="$1"
             Release_no_dot="`echo $1 | sed -e 's,\.,,g'`"
             ;;
         -rc | --rc | -RC | --RC )
             shift
             RC="rc$1"
             ;;
         -final | --final )
             RC=final
             ;;
+        -svn-path | --svn-path )
+            shift
+            Release="test"
+            Release_no_dot="test"
+            ExportBranch="$1"
+            RC="`echo $ExportBranch | sed -e 's,/,_,g'`"
+            echo "WARNING: Using the branch $ExportBranch instead of a release tag"
+            echo "         This is intended to aid new packagers in trialing "
+            echo "         builds without requiring a tag to be created first"
+            ;;
         -triple | --triple )
             shift
             Triple="$1"
             ;;
         -configure-flags | --configure-flags )
             shift
             ExtraConfigureFlags="$1"
             ;;

 if [ -z "$Release" ]; then
     echo "error: no release number specified"
     exit 1
 fi
 if [ -z "$RC" ]; then
     echo "error: no release candidate number specified"
     exit 1
 fi
+if [ -z "$ExportBranch" ]; then
+    ExportBranch="tags/RELEASE_$Release_no_dot/$RC"
+fi
 if [ -z "$Triple" ]; then
     echo "error: no target triple specified"
     exit 1
 fi
 
 # Figure out how many make processes to run.
 if [ -z "$NumJobs" ]; then
     NumJobs=`sysctl -n hw.activecpu 2> /dev/null || true`
if [ `uname -s` != "Darwin" ]; then
   check_program_exists 'objdump'
 fi
 
 # Make sure that the URLs are valid.
 function check_valid_urls() {
     for proj in $projects ; do
         echo "# Validating $proj SVN URL"
 
-        if ! svn ls $Base_url/$proj/tags/RELEASE_$Release_no_dot/$RC > /dev/null 2>&1 ; then
-            echo "$proj $Release release candidate $RC doesn't exist!"
+        if ! svn ls $Base_url/$proj/$ExportBranch > /dev/null 2>&1 ; then
+            echo "$proj does not have a $ExportBranch branch/tag!"
             exit 1
         fi
     done
 }
 
 # Export sources to the build directory.
 function export_sources() {
     check_valid_urls
 
     for proj in $projects ; do
         echo "# Exporting $proj $Release-$RC sources"
-        if ! svn export -q $Base_url/$proj/tags/RELEASE_$Release_no_dot/$RC $proj.src ; then
+        if ! svn export -q $Base_url/$proj/$ExportBranch $proj.src ; then
             echo "error: failed to export $proj project"
             exit 1
         fi
     done
 
     echo "# Creating symlinks"
     cd $BuildDir/llvm.src/tools
     if [ ! -h clang ]; then