Browse Source

Fixed static analysis ci script. Since static analysis is performed through clang++, the clang++ compilation was removed

merge-requests/365/head
eidheim 8 years ago
parent
commit
56d711f061
  1. 3
      .travis.yml
  2. 13
      ci/static_analysis.sh

3
.travis.yml

@ -20,8 +20,7 @@ before_install:
- ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh - ./ci/update_ci.sh #travis_wait 90 ./ci/update_ci.sh
script: script:
- script=compile CXX=clang++ CC=clang ./ci/execute.sh - script=static_analysis ./ci/execute.sh
- 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=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

13
ci/static_analysis.sh

@ -1,8 +1,15 @@
#!/bin/bash #!/bin/bash
if [ "${cmake_command}" == "" ]; then
cmake_command="scan-build cmake .."
fi
if [ "${make_command}" == "" ]; then if [ "${make_command}" == "" ]; then
make_command="make -j 2" make_command="scan-build --status-bugs make -j 2"
fi fi
cd jucipp/build || exit cd jucipp || echo "Can't cd into jucipp"
exec sh -c "scan-build -o ../html_${distribution} --status-bugs ${make_command}" 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}"

Loading…
Cancel
Save