From a81f0efd2ef593484455a4a41e44d94fd1f26dc5 Mon Sep 17 00:00:00 2001
From: Felix Schindler <felix.schindler@wwu.de>
Date: Wed, 23 Mar 2016 15:04:35 +0100
Subject: [PATCH] Revert "[travis] fix dunecontrol call"
This reverts commit 7fa44f8e87c7a4eb48d0c1eb245747b03b806581.
---
.travis.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 8bc35543b..bdccdb9b2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -48,7 +48,7 @@ before_install:
install:
- cd $HOME/src
#- export INST_DCTRL=$HOME/dune/bin/dunecontrol
- - export SRC_DCTRL="$PWD/dune-common/bin/dunecontrol"
+ - export SRC_DCTRL="$PWD/dune-common/bin/dunecontrol --disable-parallel"
- ${SRC_DCTRL} ${BLD} all
# move my travis checkout into this source tree
- cp -ra ${TRAVIS_BUILD_DIR} .
@@ -93,7 +93,6 @@ env:
- LD_LIBRARY_PATH=${BASEDIR}/local/lib64:${BASEDIR}/local/lib:$LD_LIBRARY_PATH
- PKG_CONFIG_PATH=${BASEDIR}/local/lib64/pkgconfig:${BASEDIR}/local/lib/pkgconfig:${BASEDIR}/local/share/pkgconfig:$PKG_CONFIG_PATH
- MY_MODULE=dune-gdt DUNE_BUILD_DIR=build INSTALL_DIR=$HOME/dune CTEST_OUTPUT_ON_FAILURE=1
- - CONFIGURE_FLAGS="--disable-parallel"
- DCTL_ARGS="--builddir=${DUNE_BUILD_DIR} --use-cmake"
- DBG="${DCTL_ARGS} --opts=config.opts/travis.make.debug"
- REL="${DCTL_ARGS} --opts=config.opts/travis.make.release"
--
GitLab