diff options
| -rw-r--r-- | .bento_travisci.sh | 26 | ||||
| -rw-r--r-- | .travis.yml | 23 | ||||
| -rwxr-xr-x | tools/travis-test.sh | 104 |
3 files changed, 107 insertions, 46 deletions
diff --git a/.bento_travisci.sh b/.bento_travisci.sh deleted file mode 100644 index 41edde628..000000000 --- a/.bento_travisci.sh +++ /dev/null @@ -1,26 +0,0 @@ -export CI_ROOT=$PWD -cd .. - -# Waf -wget http://waf.googlecode.com/files/waf-1.7.13.tar.bz2 -tar xjvf waf-1.7.13.tar.bz2 -cd waf-1.7.13 -python waf-light -export WAFDIR=$PWD -cd .. - -# Bento -wget https://github.com/cournape/Bento/archive/master.zip -unzip master.zip -cd Bento-master -python bootstrap.py -export BENTO_ROOT=$PWD -cd .. - -cd $CI_ROOT - -# In-place numpy build -$BENTO_ROOT/bentomaker build -i -j -# Prepend to PYTHONPATH so tests can be run -export PYTHONPATH=$PWD:$PYTHONPATH - diff --git a/.travis.yml b/.travis.yml index bba6fcb37..cfff49b42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,8 @@ matrix: env: NPY_RELAXED_STRIDES_CHECKING=1 - python: 2.7 env: USE_BENTO=1 + - python: 2.7 + env: USE_CHROOT=1 ARCH=i386 DIST=saucy before_install: - uname -a - free -m @@ -31,24 +33,5 @@ before_install: - sudo apt-get install -qq libatlas-dev libatlas-base-dev gfortran - popd -install: - # We used to use 'setup.py install' here, but that has the terrible - # behaviour that if a copy of the package is already installed in - # the install location, then the new copy just gets dropped on top - # of it. Travis typically has a stable numpy release pre-installed, - # and if we don't remove it, then we can accidentally end up - # e.g. running old test modules that were in the stable release but - # have been removed from master. (See gh-2765, gh-2768.) Using 'pip - # install' also has the advantage that it tests that numpy is 'pip - # install' compatible, see e.g. gh-2766... - - if [ "${USE_BENTO}" == "1" ]; then source .bento_travisci.sh; else pip install .; fi script: - # We change directories to make sure that python won't find the copy - # of numpy in the source directory. - - mkdir empty - - cd empty - - INSTALLDIR=$(python -c "import os; import numpy; print(os.path.dirname(numpy.__file__))") - - export PYTHONWARNINGS=default - - python ../tools/test-installed-numpy.py --mode=full - # - coverage run --source=$INSTALLDIR --rcfile=../.coveragerc $(which python) ../tools/test-installed-numpy.py - # - coverage report --rcfile=../.coveragerc --show-missing + - ./tools/travis-test.sh diff --git a/tools/travis-test.sh b/tools/travis-test.sh new file mode 100755 index 000000000..75a3f5678 --- /dev/null +++ b/tools/travis-test.sh @@ -0,0 +1,104 @@ +#!/bin/sh +set -ex + +# setup env +if [ -r /usr/lib/libeatmydata/libeatmydata.so ]; then + # much faster package installation + export LD_PRELOAD=/usr/lib/libeatmydata/libeatmydata.so +fi + + +setup_base() +{ + # We used to use 'setup.py install' here, but that has the terrible + # behaviour that if a copy of the package is already installed in + # the install location, then the new copy just gets dropped on top + # of it. Travis typically has a stable numpy release pre-installed, + # and if we don't remove it, then we can accidentally end up + # e.g. running old test modules that were in the stable release but + # have been removed from master. (See gh-2765, gh-2768.) Using 'pip + # install' also has the advantage that it tests that numpy is 'pip + # install' compatible, see e.g. gh-2766... + pip install . +} + +setup_chroot() +{ + # this can all be replaced with: + # apt-get install libpython2.7-dev:i386 + # CC="gcc -m32" LDSHARED="gcc -m32 -shared" LDFLAGS="-m32 -shared" linux32 python setup.py build + # when travis updates to ubuntu 14.04 + DIR=$1 + set -u + sudo apt-get -qq -y --force-yes install debootstrap eatmydata + sudo debootstrap --variant=buildd --include=fakeroot,build-essential --arch=$ARCH --foreign $DIST $DIR + sudo chroot $DIR ./debootstrap/debootstrap --second-stage + sudo rsync -a $TRAVIS_BUILD_DIR $DIR/ + echo deb http://archive.ubuntu.com/ubuntu/ saucy main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list + echo deb http://archive.ubuntu.com/ubuntu/ saucy-updates main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list + echo deb http://security.ubuntu.com/ubuntu saucy-security main restricted universe multiverse | sudo tee -a $DIR/etc/apt/sources.list + sudo chroot $DIR bash -c "apt-get update" + sudo chroot $DIR bash -c "apt-get install -qq -y --force-yes eatmydata" + echo /usr/lib/libeatmydata/libeatmydata.so | sudo tee -a $DIR/etc/ld.so.preload + sudo chroot $DIR bash -c "apt-get install -qq -y --force-yes libatlas-dev libatlas-base-dev gfortran python-dev python-nose python-pip" +} + +setup_bento() +{ + export CI_ROOT=$PWD + cd .. + + # Waf + wget http://waf.googlecode.com/files/waf-1.7.13.tar.bz2 + tar xjvf waf-1.7.13.tar.bz2 + cd waf-1.7.13 + python waf-light + export WAFDIR=$PWD + cd .. + + # Bento + wget https://github.com/cournape/Bento/archive/master.zip + unzip master.zip + cd Bento-master + python bootstrap.py + export BENTO_ROOT=$PWD + cd .. + + cd $CI_ROOT + + # In-place numpy build + $BENTO_ROOT/bentomaker build -i -j + + # Prepend to PYTHONPATH so tests can be run + export PYTHONPATH=$PWD:$PYTHONPATH +} + +run_test() +{ + # We change directories to make sure that python won't find the copy + # of numpy in the source directory. + mkdir -p empty + cd empty + INSTALLDIR=$(python -c "import os; import numpy; print(os.path.dirname(numpy.__file__))") + export PYTHONWARNINGS=default + python ../tools/test-installed-numpy.py # --mode=full + # - coverage run --source=$INSTALLDIR --rcfile=../.coveragerc $(which python) ../tools/test-installed-numpy.py + # - coverage report --rcfile=../.coveragerc --show-missing +} + +if [ "$USE_CHROOT" != "1" ] && [ "$USE_BENTO" != "1" ]; then + setup_base + run_test +elif [ -n "$USE_CHROOT" ] && [ $# -eq 0 ]; then + DIR=/chroot + setup_chroot $DIR + # run again in chroot with this time testing + sudo linux32 chroot $DIR bash -c "cd numpy && $0 test" +elif [ -n "$USE_BENTO" ] && [ $# -eq 0 ]; then + setup_bento + # run again this time testing + $0 test +else + run_test +fi + |