Update of /cvsroot/fink/experimental/fangism/finkinfo In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31943
Modified Files: llvm32.info Log Message: move bash patchery to TestScript, explicit python executable Index: llvm32.info =================================================================== RCS file: /cvsroot/fink/experimental/fangism/finkinfo/llvm32.info,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- llvm32.info 12 Jan 2013 06:44:44 -0000 1.17 +++ llvm32.info 31 May 2013 20:28:14 -0000 1.18 @@ -7,7 +7,6 @@ Maintainer: David Fang <fang...@users.sourceforge.net> # ccache is only temporary, for accelerating rebuilds -# some cyclic dependency checker script needs python BuildDepends: << fink (>= 0.28), cmake (>= 2.8.2-1), @@ -98,14 +97,7 @@ # needed for gcc-4.6 only # sed -i.orig2 -e 's|compatibility_version|dylib_&|' tools/clang/tools/libclang/CMakeLists.txt - # test suite requires newer bash than /bin/bash 2.0 for pipefail - # test the pipefail option of this shell first - set -o pipefail || { - sed -i.orig -e "/bashPath = None/s|None|'%p/bin/bash'|" utils/lit/lit/LitConfig.py - test -x %p/bin/bash || { echo "Error: Fink-built bash >= 3.0 required for pipefail!" ; exit 1; } - } - # force time limit per test (prefix each command-line) - sed -i.orig -e "/script\.append/s|ln|'gtimeout 5m '+&|" utils/lit/lit/TestRunner.py + # projects/test-suite expects built llvm/clang to have been configured # but sadly, we used cmake; don't include $llvmobjdir/Makefile.config # TODO: replace cmake build with autoconf'd build @@ -175,7 +167,7 @@ esac build_type=Release - CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_INSTALL_PREFIX=%p/opt/llvm-%v -DCMAKE_BUILD_TYPE=$build_type -DLLVM_LIT_ARGS:STRING=-v -DLLVM_ENABLE_ASSERTIONS=ON" + CMAKE_OPTIONS="$CMAKE_OPTIONS -DCMAKE_INSTALL_PREFIX=%p/opt/llvm-%v -DCMAKE_BUILD_TYPE=$build_type -DLLVM_LIT_ARGS:STRING=-v -DLLVM_ENABLE_ASSERTIONS=ON -DPYTHON_EXECUTABLE=%p/bin/python2.7" # the --max-time option applies to aggregate test time, not individual :( # CMAKE_OPTIONS="$CMAKE_OPTIONS -DLLVM_LIT_ARGS="-s -v --max-time=14400" @@ -321,6 +313,16 @@ << TestScript: << #!/bin/sh -ev + + # test suite requires newer bash than /bin/bash 2.0 for pipefail + # test the pipefail option of this shell first + set -o pipefail || { + sed -i.orig -e "/bashPath = None/s|None|'%p/bin/bash'|" utils/lit/lit/LitConfig.py + test -x %p/bin/bash || { echo "Error: Fink-built bash >= 3.0 required for pipefail!" ; exit 1; } + } + # force time limit per test (prefix each command-line) + sed -i.orig -e "/script\.append/s|ln|'gtimeout 5m '+&|" utils/lit/lit/TestRunner.py + # need path to bootstrapping compiler pushd ../opt-bin export PATH=`pwd`:$PATH ------------------------------------------------------------------------------ Get 100% visibility into Java/.NET code with AppDynamics Lite It's a free troubleshooting tool designed for production Get down to code-level detail for bottlenecks, with <2% overhead. Download for free and get started troubleshooting in minutes. http://p.sf.net/sfu/appdyn_d2d_ap2 _______________________________________________ Fink-commits mailing list Fink-commits@lists.sourceforge.net http://news.gmane.org/gmane.os.apple.fink.cvs