Merged perfTests and fixed bugs

caliGraph.py

@@ -1371,12 +1371,13 @@ def cliInterface():
 
     args = parser.parse_args()
 
-    if args.perfTest:
+    if args.perf_test:
         perfTestCLI(args)
     else:
         mainCLI(args)
 
 def perfTestCLI(args):
+    import time
     from pycallgraph import PyCallGraph
     from pycallgraph import Config
     from pycallgraph import GlobbingFilter
@@ -1384,8 +1385,9 @@ def perfTestCLI(args):
     config = Config()
     config.trace_filter = GlobbingFilter(exclude=[
         "pycallgraph.*",
+        "numpy.*"
     ])
-    with PyCallGraph(output=GraphvizOutput(output_file='perfTests/serve_httpd_' + str(int(time.time())) + '.png'), config=config):
+    with PyCallGraph(output=GraphvizOutput(output_file='perfTests/' + str(int(time.time())) + '.png'), config=config):
         mainCLI(args)
 
 def mainCLI(args):