Skip to content

Commit

Permalink
Duplicated some Travis CI builds with --enable-hpcgap option
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexander Konovalov committed Mar 15, 2017
1 parent f56152f commit 8cd3093
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 9 deletions.
16 changes: 9 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ env:
- TEST_SUITE=testinstall ABI=32 BUILDDIR=build CONFIGFLAGS=--with-gmp=builtin
- TEST_SUITE=testinstall ABI=64 BUILDDIR=build
- TEST_SUITE=testinstall ABI=64 BUILDDIR=build CONFIGFLAGS=--with-gmp=builtin
# all from above with --enable-hpcgap
- TEST_SUITE=testinstall ABI=32 HPCGAP=yes CONFIGFLAGS=--with-gmp=builtin
- TEST_SUITE=testinstall ABI=64 HPCGAP=yes
- TEST_SUITE=testinstall ABI=64 HPCGAP=yes CONFIGFLAGS=--with-gmp=builtin
# out of three builds
- TEST_SUITE=testinstall ABI=32 HPCGAP=yes BUILDDIR=build CONFIGFLAGS=--with-gmp=builtin
- TEST_SUITE=testinstall ABI=64 HPCGAP=yes BUILDDIR=build
- TEST_SUITE=testinstall ABI=64 HPCGAP=yes BUILDDIR=build CONFIGFLAGS=--with-gmp=builtin

# TODO: boehm GC, HPC-GAP compatibility mode

Expand Down Expand Up @@ -103,13 +111,7 @@ after_success:

script:
- export GAPROOT=$TRAVIS_BUILD_DIR
- ./autogen.sh
- mkdir -p $BUILDDIR
- cd $BUILDDIR
- $GAPROOT/configure $CONFIGFLAGS
- make -j4
- make bootstrap-pkg-full
- if [[ $BUILDDIR != . ]] ; then mv pkg $GAPROOT/ ; fi
- bash $GAPROOT/etc/ci-prepare.sh
- bash $GAPROOT/etc/ci.sh

notifications:
Expand Down
22 changes: 22 additions & 0 deletions etc/ci-prepare.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#!/usr/bin/env bash

set -ex

./autogen.sh
if [[ $HPCGAP = yes ]]
then
git clone https://github.com/gap-system/ward
cd ward
CFLAGS= LDFLAGS= ./build.sh
cd ..
CONFIGFLAGS="$CONFIGFLAGS --enable-hpcgap"
fi
mkdir -p $BUILDDIR
cd $BUILDDIR
$GAPROOT/configure $CONFIGFLAGS
make -j4
echo '--------------------------------'
cat gen/.deps/ariths.d
echo '--------------------------------'
make bootstrap-pkg-full
if [[ $BUILDDIR != . ]] ; then mv pkg $GAPROOT/ ; fi
6 changes: 4 additions & 2 deletions etc/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ set -ex
GAPROOT=${GAPROOT:-$PWD}
BUILDDIR=${BUILDDIR:-.}

cd $BUILDDIR

# If we don't care about code coverage, just run the test directly
if [[ -n ${NO_COVERAGE} ]]
then
Expand All @@ -32,7 +34,7 @@ fi

if [[ "${TEST_SUITE}" == testerror ]]
then
cd tst/test-error
cd $GAPROOT/tst/test-error
./run_error_tests.sh
exit 0
fi
Expand Down Expand Up @@ -116,7 +118,7 @@ GAPInput

bin/gap.sh --cover $COVDIR/${TEST_SUITE}.coverage \
<(echo 'SetUserPreference("ReproducibleBehaviour", true);') \
tst/${TEST_SUITE}.g
$GAPROOT/tst/${TEST_SUITE}.g
esac;

# generate library coverage reports
Expand Down

0 comments on commit 8cd3093

Please sign in to comment.