From 2a86c1c20b4cd2c4740b151e9488974429525c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lien=20Sell=C3=A6g?= <jorgen@guut.org>
Date: Wed, 1 Jun 2016 14:06:40 +0200
Subject: [PATCH] Make sure tests displays errors on windows, fix some bad
 practise in bash

---
 .travis.yml   |  6 +++---
 appveyor.yml  |  5 ++---
 ci/compile.sh | 11 ++++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5f69c4d..bf56673 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,14 +8,14 @@ env:
   - distribution: arch
   - distribution: debian-testing
   - distribution: debian
-  
+
 #matrix:
 #  include:
 #    - os: osx
 
 services:
   - docker
-  
+
 before_install:
   - ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh
 
@@ -24,4 +24,4 @@ script:
   - script=clean ./ci/execute.sh
   - script=compile CXX=g++ CC=gcc ./ci/execute.sh
   - script=static_analysis ./ci/execute.sh
-  - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh
\ No newline at end of file
+  - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh
diff --git a/appveyor.yml b/appveyor.yml
index 264cbef..5b6ef8f 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,6 +1,6 @@
 platform:
   - x64
-  
+
 environment:
   MSYSTEM: MSYS
 
@@ -12,5 +12,4 @@ before_build:
 
 build_script:    
   - C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh"
-  - C:\msys64\usr\bin\bash -lc "broadwayd & exit"
-  - C:\msys64\usr\bin\bash -lc "script=compile make_command='make test' C:/projects/jucipp/ci/execute.sh"
+  - C:\msys64\usr\bin\bash -lc "script=compile make_command='CTEST_OUTPUT_ON_FAILURE=1 make test' C:/projects/jucipp/ci/execute.sh"
diff --git a/ci/compile.sh b/ci/compile.sh
index e2bafd6..59d86f2 100755
--- a/ci/compile.sh
+++ b/ci/compile.sh
@@ -8,6 +8,7 @@ if [ "${cmake_command}" == "" ]; then
       mingw="mingw32"
     fi
     cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
+    make_command="make"
   else
     cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
   fi
@@ -17,8 +18,8 @@ if [ "${make_command}" == "" ]; then
   make_command="make -j 2"
 fi
 
-cd jucipp || (echo "Can't cd into jucipp"; return 1)
-git submodule update --init --recursive
-mkdir -p build && cd build || (echo "Error making build directory"; return 1)
-sh -c "${cmake_command}" || (echo "Cmake configuration failed"; return 1)
-exec sh -c "${make_command}"
\ No newline at end of file
+cd jucipp || echo "Can't cd into jucipp"
+git submodule update --init --recursive # appveyor doesn't checkout recursively
+mkdir -p build && cd build || echo "Error making build directory"
+sh -c "${cmake_command}" || echo "Cmake configuration failed"
+exec sh -c "${make_command}"