From 3371b5b8253d951c4d6c7f4d78f524dd17217f34 Mon Sep 17 00:00:00 2001
From: Giovanni Bussi <giovanni.bussi@gmail.com>
Date: Mon, 6 Nov 2017 19:52:36 +0100
Subject: [PATCH] MacPorts tests on travis-ci are now made within MacPorts
Exploits 07552b60bba1d53ee6ad7d82920ceb43d998c174
---
.travis.yml | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index ef5f45aeb..717fed3f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -173,7 +173,8 @@ script:
# build using macports
- if test -n "$PLUMED_MACPORTS" ; then
- sudo port -N install $PLUMED_MACPORTS ;
+ sudo port -N -k install $PLUMED_MACPORTS ;
+ plumed config show
./macports-ci ccache --save ;
fi
@@ -183,7 +184,7 @@ script:
# TEST:
- if test "$VALGRIND" == yes ; then OPT=valgrind ; else OPT="" ; fi
# --no-print-directory make it more silent
- - if test "$PLUMED_CXX" || test -n "$PLUMED_MACPORTS" ; then make --no-print-directory -C regtest $OPT ; fi
+ - if test "$PLUMED_CXX" ; then make --no-print-directory -C regtest $OPT ; fi
# test with gcc6
- if test "$PLUMED_DOCKER" = yes ; then docker run -v "$PWD/regtest":/home/plumed/regtest -it plumed /bin/bash -c "make -C regtest" ; fi
@@ -192,7 +193,8 @@ script:
- if test "$MAKEDOC" == yes ; then make -C regtest copytodoc ; fi
- if test "$MAKEDOC" == yes ; then make -C developer-doc coverage ; fi
- if test "$MAKEDOC" == yes ; then make doc >/dev/null ; fi
- - if test "$PLUMED_CXX" || test -n "$PLUMED_MACPORTS" ; then make -C regtest checkfail ; fi
+ - if test "$PLUMED_CXX" ; then make -C regtest checkfail ; fi
+ - if test -n "$PLUMED_MACPORTS" ; then sudo port -N -d test $PLUMED_MACPORTS ; fi
# CPPCHECK:
# this is required so as to have all the include files inplace:
--
GitLab