X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=utils%2Frelease%2Ftest-release.sh;h=89519c47e35b650aa9edd4360ad8657ce17213b7;hp=d2946d8762ac842495634c7f1af8a3c4582c23e2;hb=3d09e0e55093ecb569a5c7009f105a1b4a257e89;hpb=e4576266f49169ad0ae112d9cb565e7d7c4bf24e diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index d2946d8762a..89519c47e35 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -18,7 +18,7 @@ else MAKE=make fi -projects="llvm cfe dragonegg compiler-rt test-suite" +projects="llvm cfe compiler-rt libcxx libcxxabi test-suite clang-tools-extra" # Base SVN URL for the sources. Base_url="http://llvm.org/svn/llvm-project" @@ -26,36 +26,38 @@ Base_url="http://llvm.org/svn/llvm-project" Release="" Release_no_dot="" RC="" +Triple="" +use_gzip="no" do_checkout="yes" -do_ada="no" do_clang="yes" -do_dragonegg="no" -do_fortran="no" -do_objc="yes" do_64bit="yes" do_debug="no" do_asserts="no" do_compare="yes" BuildDir="`pwd`" +BuildTriple="" function usage() { echo "usage: `basename $0` -release X.Y -rc NUM [OPTIONS]" echo "" - echo " -release X.Y The release number to test." - echo " -rc NUM The pre-release candidate number." - echo " -final The final release candidate." - 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 " -no-64bit Don't test the 64-bit version. [default: yes]" - echo " -enable-ada Build Ada. [default: disable]" - echo " -disable-clang Do not test clang. [default: enable]" - echo " -enable-dragonegg Test dragonegg. [default: disable]" - echo " -enable-fortran Enable Fortran build. [default: disable]" - echo " -disable-objc Disable ObjC build. [default: enable]" - 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 " -release X.Y The release number 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 " -no-64bit Don't test the 64-bit version. [default: yes]" + echo " -enable-ada Build Ada. [default: disable]" + echo " -disable-clang Do not test clang. [default: enable]" + echo " -enable-fortran Enable Fortran build. [default: disable]" + echo " -disable-objc Disable ObjC build. [default: enable]" + 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 " -build-triple TRIPLE The build triple for this machine" + echo " [default: use config.guess]" } while [ $# -gt 0 ]; do @@ -63,7 +65,7 @@ while [ $# -gt 0 ]; do -release | --release ) shift Release="$1" - Release_no_dot="`echo $1 | sed -e 's,\.,,'`" + Release_no_dot="`echo $1 | sed -e 's,\.,,g'`" ;; -rc | --rc | -RC | --RC ) shift @@ -72,6 +74,14 @@ while [ $# -gt 0 ]; do -final | --final ) RC=final ;; + -triple | --triple ) + shift + Triple="$1" + ;; + -build-triple | --build-triple ) + shift + BuildTriple="$1" + ;; -j* ) NumJobs="`echo $1 | sed -e 's,-j\([0-9]*\),\1,g'`" if [ -z "$NumJobs" ]; then @@ -89,21 +99,9 @@ while [ $# -gt 0 ]; do -no-64bit | --no-64bit ) do_64bit="no" ;; - -enable-ada | --enable-ada ) - do_ada="yes" - ;; -disable-clang | --disable-clang ) do_clang="no" ;; - -enable-dragonegg | --enable-dragonegg ) - do_dragonegg="yes" - ;; - -enable-fortran | --enable-fortran ) - do_fortran="yes" - ;; - -disable-objc | --disable-objc ) - do_objc="no" - ;; -test-debug | --test-debug ) do_debug="yes" ;; @@ -113,6 +111,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 @@ -135,6 +136,10 @@ if [ -z "$RC" ]; then echo "error: no release candidate number specified" exit 1 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 @@ -159,27 +164,27 @@ cd $BuildDir LogDir=$BuildDir/logs mkdir -p $LogDir -# Find compilers. -if [ "$do_dragonegg" = "yes" ]; then - gcc_compiler="$GCC" - if [ -z "$gcc_compiler" ]; then - gcc_compiler="`which gcc`" - if [ -z "$gcc_compiler" ]; then - echo "error: cannot find gcc to use with dragonegg" - exit 1 - fi - fi - - gxx_compiler="$GXX" - if [ -z "$gxx_compiler" ]; then - gxx_compiler="`which g++`" - if [ -z "$gxx_compiler" ]; then - echo "error: cannot find g++ to use with dragonegg" - exit 1 - fi - fi +# Final package name. +Package=clang+llvm-$Release +if [ $RC != "final" ]; then + Package=$Package-$RC fi +Package=$Package-$Triple + +# Make sure that a required program is available +function check_program_exists() { + local program="$1" + if ! type -P $program > /dev/null 2>&1 ; then + echo "program '$1' not found !" + exit 1 + fi +} +if [ `uname -s` != "Darwin" ]; then + check_program_exists 'chrpath' + check_program_exists 'file' + check_program_exists 'objdump' +fi # Make sure that the URLs are valid. function check_valid_urls() { @@ -187,18 +192,18 @@ function check_valid_urls() { echo "# Validating $proj SVN URL" if ! svn ls $Base_url/$proj/tags/RELEASE_$Release_no_dot/$RC > /dev/null 2>&1 ; then - echo "llvm $Release release candidate $RC doesn't exist!" + echo "$proj $Release release candidate $RC doesn't exist!" exit 1 fi done } -# Export sources to the the build directory. +# Export sources to the build directory. function export_sources() { check_valid_urls for proj in $projects ; do - echo "# Exporting $proj $Release-RC$RC sources" + echo "# Exporting $proj $Release-$RC sources" if ! svn export -q $Base_url/$proj/tags/RELEASE_$Release_no_dot/$RC $proj.src ; then echo "error: failed to export $proj project" exit 1 @@ -210,13 +215,23 @@ function export_sources() { if [ ! -h clang ]; then ln -s ../../cfe.src clang fi + cd $BuildDir/llvm.src/tools/clang/tools + if [ ! -h clang-tools-extra ]; then + ln -s ../../../../clang-tools-extra.src extra + fi cd $BuildDir/llvm.src/projects - if [ ! -h llvm-test ]; then - ln -s ../../test-suite.src llvm-test + if [ ! -h test-suite ]; then + ln -s ../../test-suite.src test-suite fi if [ ! -h compiler-rt ]; then ln -s ../../compiler-rt.src compiler-rt fi + if [ ! -h libcxx ]; then + ln -s ../../libcxx.src libcxx + fi + if [ ! -h libcxxabi ]; then + ln -s ../../libcxxabi.src libcxxabi + fi cd $BuildDir } @@ -249,16 +264,21 @@ function configure_llvmCore() { echo "# Using C compiler: $c_compiler" echo "# Using C++ compiler: $cxx_compiler" + build_triple_option="${BuildTriple:+--build=$BuildTriple}" + cd $ObjDir echo "# Configuring llvm $Release-$RC $Flavor" echo "# $BuildDir/llvm.src/configure --prefix=$InstallDir \ --enable-optimized=$Optimized \ - --enable-assertions=$Assertions" + --enable-assertions=$Assertions \ + --disable-timestamps \ + $build_triple_option" env CC="$c_compiler" CXX="$cxx_compiler" \ $BuildDir/llvm.src/configure --prefix=$InstallDir \ --enable-optimized=$Optimized \ --enable-assertions=$Assertions \ --disable-timestamps \ + $build_triple_option \ 2>&1 | tee $LogDir/llvm.configure-Phase$Phase-$Flavor.log cd $BuildDir } @@ -286,28 +306,6 @@ function build_llvmCore() { cd $BuildDir } -function build_dragonegg() { - Phase="$1" - Flavor="$2" - LLVMInstallDir="$3" - DragonEggObjDir="$4" - LLVM_CONFIG=$LLVMInstallDir/bin/llvm-config - TOP_DIR=$BuildDir/dragonegg.src - - echo "# Targeted compiler: $gcc_compiler" - - cd $DragonEggObjDir - echo "# Compiling phase $Phase dragonegg $Release-$RC $Flavor" - echo -n "# CXX=$cxx_compiler TOP_DIR=$TOP_DIR GCC=$gcc_compiler " - echo -n "LLVM_CONFIG=$LLVM_CONFIG ${MAKE} -f $TOP_DIR/Makefile " - echo "-j $NumJobs VERBOSE=1" - CXX="$cxx_compiler" TOP_DIR="$TOP_DIR" GCC="$gcc_compiler" \ - LLVM_CONFIG="$LLVM_CONFIG" ${MAKE} -f $TOP_DIR/Makefile \ - -j $NumJobs VERBOSE=1 \ - 2>&1 | tee $LogDir/dragonegg-Phase$Phase-$Flavor.log - cd $BuildDir -} - function test_llvmCore() { Phase="$1" Flavor="$2" @@ -321,6 +319,38 @@ function test_llvmCore() { cd $BuildDir } +# Clean RPATH. Libtool adds the build directory to the search path, which is +# not necessary --- and even harmful --- for the binary packages we release. +function clean_RPATH() { + if [ `uname -s` = "Darwin" ]; then + return + fi + local InstallPath="$1" + for Candidate in `find $InstallPath/{bin,lib} -type f`; do + if file $Candidate | grep ELF | egrep 'executable|shared object' > /dev/null 2>&1 ; then + rpath=`objdump -x $Candidate | grep 'RPATH' | sed -e's/^ *RPATH *//'` + if [ -n "$rpath" ]; then + newrpath=`echo $rpath | sed -e's/.*\(\$ORIGIN[^:]*\).*/\1/'` + chrpath -r $newrpath $Candidate 2>&1 > /dev/null 2>&1 + fi + fi + done +} + +# Create a package of the release binaries. +function package_release() { + cwd=`pwd` + cd $BuildDir/Phase3/Release + mv llvmCore-$Release-$RC.install $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 +} + set -e # Exit if any command fails if [ "$do_checkout" = "yes" ]; then @@ -355,51 +385,42 @@ for Flavor in $Flavors ; do llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj llvmCore_phase1_installdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install - dragonegg_phase1_objdir=$BuildDir/Phase1/$Flavor/DragonEgg-$Release-$RC.obj llvmCore_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-$RC.obj llvmCore_phase2_installdir=$BuildDir/Phase2/$Flavor/llvmCore-$Release-$RC.install llvmCore_de_phase2_objdir=$BuildDir/Phase2/$Flavor/llvmCore-DragonEgg-$Release-$RC.obj llvmCore_de_phase2_installdir=$BuildDir/Phase2/$Flavor/llvmCore-DragonEgg-$Release-$RC.install - dragonegg_phase2_objdir=$BuildDir/Phase2/$Flavor/DragonEgg-$Release-$RC.obj llvmCore_phase3_objdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-$RC.obj llvmCore_phase3_installdir=$BuildDir/Phase3/$Flavor/llvmCore-$Release-$RC.install llvmCore_de_phase3_objdir=$BuildDir/Phase3/$Flavor/llvmCore-DragonEgg-$Release-$RC.obj llvmCore_de_phase3_installdir=$BuildDir/Phase3/$Flavor/llvmCore-DragonEgg-$Release-$RC.install - dragonegg_phase3_objdir=$BuildDir/Phase3/$Flavor/DragonEgg-$Release-$RC.obj rm -rf $llvmCore_phase1_objdir rm -rf $llvmCore_phase1_installdir - rm -rf $dragonegg_phase1_objdir rm -rf $llvmCore_phase2_objdir rm -rf $llvmCore_phase2_installdir rm -rf $llvmCore_de_phase2_objdir rm -rf $llvmCore_de_phase2_installdir - rm -rf $dragonegg_phase2_objdir rm -rf $llvmCore_phase3_objdir rm -rf $llvmCore_phase3_installdir rm -rf $llvmCore_de_phase3_objdir rm -rf $llvmCore_de_phase3_installdir - rm -rf $dragonegg_phase3_objdir mkdir -p $llvmCore_phase1_objdir mkdir -p $llvmCore_phase1_installdir - mkdir -p $dragonegg_phase1_objdir mkdir -p $llvmCore_phase2_objdir mkdir -p $llvmCore_phase2_installdir mkdir -p $llvmCore_de_phase2_objdir mkdir -p $llvmCore_de_phase2_installdir - mkdir -p $dragonegg_phase2_objdir mkdir -p $llvmCore_phase3_objdir mkdir -p $llvmCore_phase3_installdir mkdir -p $llvmCore_de_phase3_objdir mkdir -p $llvmCore_de_phase3_installdir - mkdir -p $dragonegg_phase3_objdir ############################################################################ # Phase 1: Build llvmCore and clang @@ -408,6 +429,7 @@ for Flavor in $Flavors ; do $llvmCore_phase1_objdir $llvmCore_phase1_installdir build_llvmCore 1 $Flavor \ $llvmCore_phase1_objdir + clean_RPATH $llvmCore_phase1_installdir # Test clang if [ "$do_clang" = "yes" ]; then @@ -420,6 +442,7 @@ for Flavor in $Flavors ; do $llvmCore_phase2_objdir $llvmCore_phase2_installdir build_llvmCore 2 $Flavor \ $llvmCore_phase2_objdir + clean_RPATH $llvmCore_phase2_installdir ######################################################################## # Phase 3: Build llvmCore with newly built clang from phase 2. @@ -430,6 +453,7 @@ for Flavor in $Flavors ; do $llvmCore_phase3_objdir $llvmCore_phase3_installdir build_llvmCore 3 $Flavor \ $llvmCore_phase3_objdir + clean_RPATH $llvmCore_phase3_installdir ######################################################################## # Testing: Test phase 3 @@ -451,69 +475,24 @@ for Flavor in $Flavors ; do fi fi - # Test dragonegg - if [ "$do_dragonegg" = "yes" ]; then - # Build dragonegg using the targeted gcc. This isn't necessary, but - # helps avoid using broken versions of gcc (which are legion), tests - # that the targeted gcc is basically sane and is consistent with the - # later phases in which the targeted gcc + dragonegg are used. - c_compiler="$gcc_compiler" - cxx_compiler="$gxx_compiler" - build_dragonegg 1 $Flavor $llvmCore_phase1_installdir $dragonegg_phase1_objdir - - ######################################################################## - # Phase 2: Build llvmCore with newly built dragonegg from phase 1. - c_compiler="$gcc_compiler -fplugin=$dragonegg_phase1_objdir/dragonegg.so" - cxx_compiler="$gxx_compiler -fplugin=$dragonegg_phase1_objdir/dragonegg.so" - echo "# Phase 2: Building llvmCore with dragonegg" - configure_llvmCore 2 $Flavor \ - $llvmCore_de_phase2_objdir $llvmCore_de_phase2_installdir - build_llvmCore 2 $Flavor \ - $llvmCore_de_phase2_objdir - build_dragonegg 2 $Flavor $llvmCore_de_phase2_installdir $dragonegg_phase2_objdir - - ######################################################################## - # Phase 3: Build llvmCore with newly built clang from phase 2. - c_compiler="$gcc_compiler -fplugin=$dragonegg_phase2_objdir/dragonegg.so" - cxx_compiler="$gxx_compiler -fplugin=$dragonegg_phase2_objdir/dragonegg.so" - echo "# Phase 3: Building llvmCore with dragonegg" - configure_llvmCore 3 $Flavor \ - $llvmCore_de_phase3_objdir $llvmCore_de_phase3_installdir - build_llvmCore 3 $Flavor \ - $llvmCore_de_phase3_objdir - build_dragonegg 3 $Flavor $llvmCore_de_phase3_installdir $dragonegg_phase3_objdir - - ######################################################################## - # Testing: Test phase 3 - c_compiler="$gcc_compiler -fplugin=$dragonegg_phase3_objdir/dragonegg.so" - cxx_compiler="$gxx_compiler -fplugin=$dragonegg_phase3_objdir/dragonegg.so" - echo "# Testing - built with dragonegg" - test_llvmCore 3 $Flavor $llvmCore_de_phase3_objdir - - ######################################################################## - # Compare .o files between Phase2 and Phase3 and report which ones differ. - echo - echo "# Comparing Phase 2 and Phase 3 files" - for o in `find $llvmCore_de_phase2_objdir -name '*.o'` \ - `find $dragonegg_phase2_objdir -name '*.o'` ; do - p3=`echo $o | sed -e 's,Phase2,Phase3,'` - if ! cmp --ignore-initial=16 $o $p3 > /dev/null 2>&1 ; then - echo "file `basename $o` differs between dragonegg phase 2 and phase 3" - fi - done - fi - # Otherwise just test the core. - if [ "$do_clang" != "yes" -a "$do_dragonegg" != "yes" ]; then + if [ "$do_clang" != "yes" ]; then echo "# Testing - built with system compiler" test_llvmCore 1 $Flavor $llvmCore_phase1_objdir fi done ) 2>&1 | tee $LogDir/testing.$Release-$RC.log +package_release + set +e # Woo hoo! echo "### Testing Finished ###" +if [ "$use_gzip" = "yes" ]; then + echo "### Package: $Package.tar.gz" +else + echo "### Package: $Package.tar.xz" +fi echo "### Logs: $LogDir" exit 0