Merge pull request #4 from hxuhack/dev-master

fix triton
hxuhack · Nov 14, 2017 · f56e995 · f56e995
2 parents df1fb0f + 4b98685
commit f56e995
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/run_tests.py b/run_tests.py
@@ -41,7 +41,7 @@ def params_list_parser(params):
     TLE = 4
     RUNTIME_ERROR = 255
 
-    MAX_TIME = 60
+    MAX_TIME = 1800
     test_results = {}
 
     func_pattern = re.compile(r'int[ \t\n]+%s\(([^)]*)\);*' % func_name)
@@ -174,11 +174,7 @@ def params_list_parser(params):
     from config.test_settings import src_dirs, switches, FUNC_NAME
     from collections import OrderedDict
 
-<<<<<<< HEAD
     res = ATKrun(switches['angr'], src_dirs, func_name=FUNC_NAME)
-=======
-    res = ATKrun(switches['klee'], src_dirs, func_name=FUNC_NAME)
->>>>>>> 41276375e785e99038ccf11241297c6a4c137fcc
 
     results = {}
     for key, item in res.items():