Browse Source

Make sure tests displays errors on windows, fix some bad practise in bash

merge-requests/365/head
Jørgen Lien Sellæg 10 years ago
parent
commit
2a86c1c20b
  1. 6
      .travis.yml
  2. 5
      appveyor.yml
  3. 11
      ci/compile.sh

6
.travis.yml

@ -8,14 +8,14 @@ env:
- distribution: arch - distribution: arch
- distribution: debian-testing - distribution: debian-testing
- distribution: debian - distribution: debian
#matrix: #matrix:
# include: # include:
# - os: osx # - os: osx
services: services:
- docker - docker
before_install: before_install:
- ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh - ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh
@ -24,4 +24,4 @@ script:
- script=clean ./ci/execute.sh - script=clean ./ci/execute.sh
- script=compile CXX=g++ CC=gcc ./ci/execute.sh - script=compile CXX=g++ CC=gcc ./ci/execute.sh
- script=static_analysis ./ci/execute.sh - script=static_analysis ./ci/execute.sh
- script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh - script=compile make_command="broadwayd & CTEST_OUTPUT_ON_FAILURE=1 make test" ./ci/execute.sh

5
appveyor.yml

@ -1,6 +1,6 @@
platform: platform:
- x64 - x64
environment: environment:
MSYSTEM: MSYS MSYSTEM: MSYS
@ -12,5 +12,4 @@ before_build:
build_script: build_script:
- C:\msys64\usr\bin\bash -lc "script=compile C:/projects/jucipp/ci/execute.sh" - 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='CTEST_OUTPUT_ON_FAILURE=1 make test' C:/projects/jucipp/ci/execute.sh"
- C:\msys64\usr\bin\bash -lc "script=compile make_command='make test' C:/projects/jucipp/ci/execute.sh"

11
ci/compile.sh

@ -8,6 +8,7 @@ if [ "${cmake_command}" == "" ]; then
mingw="mingw32" mingw="mingw32"
fi fi
cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .." cmake_command="cmake -G\"MSYS Makefiles\" -DCMAKE_INSTALL_PREFIX=/${mingw} -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
make_command="make"
else else
cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .." cmake_command="cmake -DENABLE_TESTING=1 -DCMAKE_CXX_FLAGS=-Werror .."
fi fi
@ -17,8 +18,8 @@ if [ "${make_command}" == "" ]; then
make_command="make -j 2" make_command="make -j 2"
fi fi
cd jucipp || (echo "Can't cd into jucipp"; return 1) cd jucipp || echo "Can't cd into jucipp"
git submodule update --init --recursive git submodule update --init --recursive # appveyor doesn't checkout recursively
mkdir -p build && cd build || (echo "Error making build directory"; return 1) mkdir -p build && cd build || echo "Error making build directory"
sh -c "${cmake_command}" || (echo "Cmake configuration failed"; return 1) sh -c "${cmake_command}" || echo "Cmake configuration failed"
exec sh -c "${make_command}" exec sh -c "${make_command}"

Loading…
Cancel
Save