sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix all SC2164 warnings

Browse Source
This commit is contained in:
Nyall Dawson 2018-06-21 11:51:22 +10:00
parent 0d41925535
commit 4118bafc96
9 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/travis/code_layout/install.sh
View File

@ -17,8 +17,8 @@
export CORES=2 export CORES=2
mkdir build mkdir build
pushd build pushd build || exit
cmake -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON .. cmake -DUSE_CCACHE=OFF -DWITH_CORE=OFF -DWITH_APIDOC=ON -DWITH_ASTYLE=ON -DENABLE_TESTS=ON ..
popd popd || exit

4
.ci/travis/macos/install.sh
View File

@ -15,7 +15,7 @@
########################################################################### ###########################################################################
mkdir build mkdir build
pushd build pushd build || exit
export PATH=/usr/local/opt/ccache/libexec:$PATH export PATH=/usr/local/opt/ccache/libexec:$PATH
HB=$(brew --prefix) HB=$(brew --prefix)
@ -62,4 +62,4 @@ cmake \
-DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \ -DCMAKE_CXX_FLAGS="-Wno-deprecated-declarations" \
.. ..
popd popd || exit

2
scripts/build_debian_package.sh
View File

@ -26,7 +26,7 @@ fi
if [ -d `pwd`/debian ] if [ -d `pwd`/debian ]
then then
cd debian cd debian || exit
svn update svn update
cd .. cd ..
else else

2
scripts/jenkins-run.sh
View File

@ -6,7 +6,7 @@ then
fi fi
mkdir build mkdir build
cd build cd build || exit
cmake .. cmake ..
#xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1024x768x24" make Experimental || true #xvfb-run --auto-servernum --server-num=1 --server-args="-screen 0 1024x768x24" make Experimental || true
make Experimental || true make Experimental || true

4
scripts/runtests-local-travis-config.sh
View File

@ -1,9 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
DIR=$(git rev-parse --show-toplevel) DIR=$(git rev-parse --show-toplevel)
cd $1 cd $1 || exit
FOLDER=linux FOLDER=linux
if [[ "$OSTYPE" =~ darwin* ]]; then if [[ "$OSTYPE" =~ darwin* ]]; then
GP=linux GP=linux
fi fi
ctest -E "$(cat ${DIR}/.ci/travis/${FOLDER}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" --output-on-failure ctest -E "$(cat ${DIR}/.ci/travis/${FOLDER}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" --output-on-failure
cd $DIR cd $DIR || exit

4
tests/code_layout/test_shellcheck.sh
View File

@ -4,9 +4,9 @@
DIR=$(git rev-parse --show-toplevel) DIR=$(git rev-parse --show-toplevel)
pushd ${DIR} > /dev/null pushd ${DIR} > /dev/null || exit
result=$(shellcheck -e SC2016,SC2015,SC2086,SC2002,SC1117,SC2154,SC2076,SC2046,SC1090,SC2038,SC2031,SC2030,SC2162,SC2196,SC2034,SC2044,SC2119,SC1001,SC2188,SC2119,SC2188,SC2120,SC2103,SC2059,SC2006,SC2221,SC2222,SC2120,SC2128,SC2005,SC2004,SC2013,SC2027,SC2090,SC2089,SC2124,SC2068,SC2035,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2062,SC2045,SC2028,SC1091,SC2181,SC1083,SC2116,SC2219 $(find . -name '*.sh')) result=$(shellcheck -e SC2016,SC2015,SC2086,SC2002,SC1117,SC2154,SC2076,SC2046,SC1090,SC2038,SC2031,SC2030,SC2162,SC2196,SC2034,SC2044,SC2119,SC1001,SC2188,SC2119,SC2188,SC2120,SC2103,SC2059,SC2006,SC2221,SC2222,SC2120,SC2128,SC2005,SC2004,SC2013,SC2027,SC2090,SC2089,SC2124,SC2068,SC2035,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2062,SC2045,SC2028,SC1091,SC2181,SC1083,SC2116,SC2219 $(find . -name '*.sh'))
popd > /dev/null popd > /dev/null || exit
if [[ $result ]]; then if [[ $result ]]; then
echo " *** shellcheck found script errors" echo " *** shellcheck found script errors"

4
tests/code_layout/test_sip_include.sh
View File

@ -9,7 +9,7 @@ if [[ "$OSTYPE" =~ darwin* ]]; then
GP=g GP=g
fi fi
pushd ${DIR} > /dev/null pushd ${DIR} > /dev/null || exit
code=0 code=0
modules=(core gui analysis server) modules=(core gui analysis server)
@ -36,6 +36,6 @@ if [[ code -eq 1 ]]; then
echo -e " If a header should not have a sip file created, add \x1B[33m#define SIP_NO_FILE\x1B[0m." echo -e " If a header should not have a sip file created, add \x1B[33m#define SIP_NO_FILE\x1B[0m."
fi fi
popd > /dev/null popd > /dev/null || exit
exit $code exit $code

4
tests/code_layout/test_sipfiles_uptodate.sh
View File

@ -10,7 +10,7 @@ if [[ "$OSTYPE" =~ darwin* ]]; then
GP=g GP=g
fi fi
pushd ${DIR} > /dev/null pushd ${DIR} > /dev/null || exit
modules=(core gui analysis server) modules=(core gui analysis server)
@ -57,6 +57,6 @@ It is not aimed to be manually edited
done done
popd > /dev/null popd > /dev/null || exit
exit $code exit $code

4
tests/code_layout/test_sipify.sh
View File

@ -4,9 +4,9 @@
DIR=$(git rev-parse --show-toplevel) DIR=$(git rev-parse --show-toplevel)
pushd ${DIR} > /dev/null pushd ${DIR} > /dev/null || exit
outdiff=$(./scripts/sipify.pl tests/code_layout/sipifyheader.h | diff tests/code_layout/sipifyheader.expected.sip -) outdiff=$(./scripts/sipify.pl tests/code_layout/sipifyheader.h | diff tests/code_layout/sipifyheader.expected.sip -)
popd > /dev/null popd > /dev/null || exit
if [[ $outdiff ]]; then if [[ $outdiff ]]; then
echo " *** sipify.pl did not output expected file" echo " *** sipify.pl did not output expected file"