[llvm-branch-commits] [llvm-branch] r195568 - Merging r195567:

[Bill Wendling]

Author: void
Date: Sat Nov 23 23:30:06 2013
New Revision: 195568

URL: http://llvm.org/viewvc/llvm-project?rev=195568&view=rev
Log:
Merging r195567:
------------------------------------------------------------------------
r195567 | void | 2013-11-23 21:29:35 -0800 (Sat, 23 Nov 2013) | 1 line

Default to a better compression algorithm.
------------------------------------------------------------------------

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

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 23 23:30:06 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195152,195156-195157,195161-195162,195193,195272,195317-195318,195333,195339,195355,195397-195399,195421,195423,195439
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195152,195156-195157,195161-195162,195193,195272,195317-195318,195333,195339,195355,195397-195399,195421,195423,195439,195567

Modified: llvm/branches/release_34/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/utils/release/test-release.sh?rev=195568&r1=195567&r2=195568&view=diff
==============================================================================
--- llvm/branches/release_34/utils/release/test-release.sh (original)
+++ llvm/branches/release_34/utils/release/test-release.sh Sat Nov 23 23:30:06 2013
@@ -27,6 +27,7 @@ Release=""
 Release_no_dot=""
 RC=""
 Triple=""
+use_gzip="no"
 do_checkout="yes"
 do_ada="no"
 do_clang="yes"
@@ -58,6 +59,7 @@ function usage() {
     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."
 }
 
 while [ $# -gt 0 ]; do
@@ -119,6 +121,9 @@ while [ $# -gt 0 ]; do
         -no-compare-files | --no-compare-files )
             do_compare="no"
             ;;
+        -use-gzip | --use-gzip )
+            use_gzip="yes"
+            ;;
         -help | --help | -h | --h | -\? )
             usage
             exit 0
@@ -382,7 +387,11 @@ function package_release() {
     cwd=`pwd`
     cd $BuildDir/Phase3/Release
     mv llvmCore-$Release-$RC.install $Package
-    tar cfz $BuildDir/$Package.tar.gz $Package
+    if [ "$use_gzip" = "yes" ]; then
+      tar cfz $BuildDir/$Package.tar.gz $Package
+    else
+      tar cfJ $BuildDir/$Package.tar.xz $Package
+    fi
     mv $Package llvmCore-$Release-$RC.install
     cd $cwd
 }
@@ -588,6 +597,10 @@ set +e
 
 # Woo hoo!
 echo "### Testing Finished ###"
-echo "### Package: $Package.tar.gz"
+if [ "$use_gzip" = "yes" ]; then
+  echo "### Package: $Package.tar.gz"
+else
+  echo "### Package: $Package.tar.xz"
+fi
 echo "### Logs: $LogDir"
 exit 0