Browse Source

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

merge-requests/37/head
eidheim 8 years ago
parent
commit
22cf15d1fe
  1. 3
      .travis.yml
  2. 1
      ci/compile.sh
  3. 12
      ci/static_analysis.sh

3
.travis.yml

@ -14,7 +14,6 @@ before_install:
- ./ci/update_ci.sh
script:
- script=compile CXX=clang++ CC=clang ./ci/execute.sh
- script=static_analysis ./ci/execute.sh
- script=clean ./ci/execute.sh
- script=compile CXX=g++ CC=gcc ./ci/execute.sh
- script=static_analysis ./ci/execute.sh

1
ci/compile.sh

@ -19,7 +19,6 @@ if [ "${make_command}" == "" ]; then
fi
cd libclangmm || echo "Can't cd into libclangmm"
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}"

12
ci/static_analysis.sh

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