]
output_types = [
- 'xdot'
+ ('xdot', 'xdot:xdot:core')
]
def generate_vuln_graph(vulnfile, output_type):
if not os.path.exists('output'):
os.makedirs('output')
- output_file = 'output/' + vulnfile + '.' + output_type
+ output_file = 'output/' + vulnfile + '.' + output_type[0]
input_file = 'input/' + vulnfile + '.dot'
- process = Popen(['dot', '-T' + output_type, '-o', output_file, input_file], stdin=PIPE)
+ process = Popen(['dot', '-T' + output_type[1], '-o', output_file, input_file], stdin=PIPE)
if process.wait() < 0:
print('An error occurred while generating: ' + output_file)
for vulnfile in vulnfiles:
for output_type in output_types:
generate_vuln_graph(vulnfile, output_type)
- if not compare_graphs(vulnfile, output_type):
+ if not compare_graphs(vulnfile, output_type[0]):
failures += 1
print('')