summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-13 17:17:45 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-13 17:17:45 (GMT)
commit32ad273cf4fdc4cd0df9c8982824b62c02a3c61a (patch)
tree1f6962fe3cd57885eefab7e0accebd4bea4b2a47
parentb732f7f5113e978b01d7bf7581e66ce6956ba99a (diff)
downloadswift-contrib-32ad273cf4fdc4cd0df9c8982824b62c02a3c61a.zip
swift-contrib-32ad273cf4fdc4cd0df9c8982824b62c02a3c61a.tar.bz2
Tweaked CppCheck script.
-rwxr-xr-xBuildTools/Cppcheck.sh12
-rw-r--r--Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp3
2 files changed, 7 insertions, 8 deletions
diff --git a/BuildTools/Cppcheck.sh b/BuildTools/Cppcheck.sh
index 93b5d13..a1f33f6 100755
--- a/BuildTools/Cppcheck.sh
+++ b/BuildTools/Cppcheck.sh
@@ -2,8 +2,11 @@
cppcheck $@ \
--enable=all \
+ --inline-suppr \
+ --suppress=postfixOperator:3rdParty/hippomocks.h \
+ --suppress=stlSize:3rdParty/hippomocks.h \
+ --suppress=noConstructor \
-i 3rdParty -i .git -i .sconf_temp \
- -i 3rdParty/hippomocks.h \
-i Swiftob/linit.cpp \
-i Swift/QtUI/EventViewer/main.cpp \
-i Swift/QtUI/ApplicationTest \
@@ -13,9 +16,4 @@ cppcheck $@ \
\
-I . \
-I Swift/QtUI \
- . 2> cppcheck.tmp
-cat cppcheck.tmp | grep -v "(style)" | grep -v "\[3rdParty/hippomocks.h" > cppcheck.log
-rm cppcheck.tmp
-
-echo "Result (cppcheck.log):"
-cat cppcheck.log
+ .
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
index 07afc73..ee27196 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
@@ -61,7 +61,8 @@ class ChatsManagerTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE_END();
public:
- void setUp() {
+ // cppcheck-suppress publicAllocationError
+ void setUp() {
mocks_ = new MockRepository();
jid_ = JID("test@test.com/resource");
stanzaChannel_ = new DummyStanzaChannel();