walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

daca2: print error message (DacaWrongData) instead of crashing when wrong data is seen

This commit is contained in:
Daniel Marjamäki 2017-06-04 14:05:34 +02:00
parent 26bd863d0a
commit 2106099029
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/check.h
View File

@ -32,15 +32,15 @@
#include <string> #include <string>
/** /**
* When -DUNSTABLE is used, Cppcheck will be more unstable and can crash * When -DDACA2 is used, Cppcheck will print error messages when wrong
* when there is wrong data. This is intended to be used in daca2. * data is seen. Intended to be used in Daca2
* *
* Use CHECK_WRONG_DATA in checkers when you avoid crashes for wrong data. * Use CHECK_WRONG_DATA in checkers when you check for wrong data.
*/ */
#ifdef UNSTABLE #ifdef DACA2
#define CHECK_WRONG_DATA(X) (1) // crash/hang #define CHECK_WRONG_DATA(X, TOK) ({ if(X) reportError(TOK,Severity::error,"DacaWrongData","Wrong data detected"); X;})
#else #else
#define CHECK_WRONG_DATA(X) (X) // don't crash/hang #define CHECK_WRONG_DATA(X) (X)
#endif #endif
namespace tinyxml2 { namespace tinyxml2 {

29
tools/rundaca2.py
View File

@ -24,21 +24,17 @@ def compilecppcheck(CPPFLAGS):
subprocess.call(['nice', 'make', 'SRCDIR=build', 'CFGDIR=' + os.path.expanduser('~/cppcheck/cfg'), 'CXXFLAGS=-g -O2', 'CPPFLAGS=' + CPPFLAGS]) subprocess.call(['nice', 'make', 'SRCDIR=build', 'CFGDIR=' + os.path.expanduser('~/cppcheck/cfg'), 'CXXFLAGS=-g -O2', 'CPPFLAGS=' + CPPFLAGS])
subprocess.call(['cp', 'cppcheck', os.path.expanduser('~/daca2/cppcheck-O2')]) subprocess.call(['cp', 'cppcheck', os.path.expanduser('~/daca2/cppcheck-O2')])
def runcppcheck(rev, folder, destpath): def runcppcheck(rev, folder):
subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/' + folder)]) subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/' + folder)])
subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), folder, '--rev=' + rev, '--skip=virtuoso-opensource']) subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), folder, '--rev=' + rev])
subprocess.call(['rm', '-rf', destpath + folder])
subprocess.call(['cp', '-R', os.path.expanduser('~/daca2/' + folder), destpath + folder])
subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/lib' + folder)]) subprocess.call(['rm', '-rf', os.path.expanduser('~/daca2/lib' + folder)])
subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), 'lib' + folder, '--rev=' + rev]) subprocess.call(['nice', '--adjustment=19', 'python', os.path.expanduser('~/cppcheck/tools/daca2.py'), 'lib'+folder, '--rev=' + rev])
subprocess.call(['rm', '-rf', destpath + 'lib' + folder])
subprocess.call(['cp', '-R', os.path.expanduser('~/daca2/lib' + folder), destpath + 'lib' + folder])
def daca2report(daca2folder, reportfolder): def daca2report(reportfolder):
subprocess.call(['rm', '-rf', reportfolder]) subprocess.call(['rm', '-rf', reportfolder])
subprocess.call(['mkdir', reportfolder]) subprocess.call(['mkdir', reportfolder])
subprocess.call(['python', os.path.expanduser('~/cppcheck/tools/daca2-report.py'), '--daca2='+daca2folder, reportfolder]) subprocess.call(['python', os.path.expanduser('~/cppcheck/tools/daca2-report.py'), reportfolder])
# Upload file to sourceforge server using scp # Upload file to sourceforge server using scp
def upload(localfolder, webfolder): def upload(localfolder, webfolder):
@ -73,17 +69,10 @@ def daca2(foldernum):
rev = comm[0] rev = comm[0]
rev = rev[:rev.find('\n')] rev = rev[:rev.find('\n')]
# unstable compilecppcheck('-DMAXTIME=600 -DDACA2')
compilecppcheck('-DMAXTIME=600 -DUNSTABLE') runcppcheck(rev, folder)
runcppcheck(rev, folder, os.path.expanduser('~/daca2-unstable/')) daca2report(os.path.expanduser('~/daca2-report'))
daca2report(os.path.expanduser('~/daca2-unstable'), os.path.expanduser('~/daca2-unstable-report')) upload(os.path.expanduser('~/daca2-report'), 'devinfo/')
upload(os.path.expanduser('~/daca2-unstable-report'), 'devinfo/')
# stable
compilecppcheck('-DMAXTIME=600')
runcppcheck(rev, folder, os.path.expanduser('~/daca2-stable/'))
daca2report(os.path.expanduser('~/daca2-stable/'), os.path.expanduser('~/daca2-stable-report/'))
upload(os.path.expanduser('~/daca2-stable-report'), 'devinfo/')
foldernum = START foldernum = START
while True: while True: