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

test/bug-hunting: add --clang option to the juliet testing

This commit is contained in:
Daniel Marjamäki 2020-01-20 18:53:40 +01:00
parent 3ccd369cf5
commit 6722ee9d3f
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/clangimport.cpp
View File

@ -799,7 +799,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)
par1->link(par2);
par2->link(par1);
par1->astOperand1(tok1);
par1->astOperand1(expr);
par1->astOperand2(expr);
createScope(tokenList, Scope::ScopeType::eSwitch, children.back());
return nullptr;
}

15
test/bug-hunting/juliet.py
View File

@ -1,19 +1,22 @@
# Test if --verify works using the juliet testsuite
# Test if --bug-hunting works using the juliet testsuite
# The Juliet test suite can be downloaded from:
# https://samate.nist.gov/SRD/testsuite.php
import glob
import os
import re
import shutil
import sys
import subprocess
JULIET_PATH = os.path.expanduser('~/juliet')
if sys.argv[0] in ('test/verify/juliet.py', './test/verify/juliet.py'):
if sys.argv[0] in ('test/bug-hunting/juliet.py', './test/bug-hunting/juliet.py'):
CPPCHECK_PATH = './cppcheck'
else:
CPPCHECK_PATH = '../../cppcheck'
RUN_CLANG = ('--clang' in sys.argv)
def get_files(juliet_path:str, test_cases:str):
ret = []
g = os.path.join(juliet_path, test_cases)
@ -42,11 +45,17 @@ def check(tc:str, warning_id:str):
'--library=posix',
'--bug-hunting',
'--platform=unix64']
if RUN_CLANG:
cmd += ['--clang', '--cppcheck-build-dir=juliet-build-dir']
if not os.path.isdir('juliet-build-dir'):
os.mkdir('juliet-build-dir')
cmd += glob.glob(f)
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
comm = p.communicate()
stdout = comm[0].decode(encoding='utf-8', errors='ignore')
stderr = comm[1].decode(encoding='utf-8', errors='ignore')
if RUN_CLANG:
shutil.rmtree('juliet-build-dir')
if warning_id in stderr:
num_ok += 1
@ -61,7 +70,7 @@ def check(tc:str, warning_id:str):
final_report = ''
final_report += check('C/testcases/CWE369_Divide_by_Zero/s*/*.c', 'verificationDivByZero')
final_report += check('C/testcases/CWE369_Divide_by_Zero/s*/*.c', 'bughuntingDivByZero')
#final_report += check('C/testcases/CWE457_Use_of_Uninitialized_Variable/s*/*.c', 'verificationUninit')
print(final_report)