Bugfix: always pass lava-wl to lavaTool, update blecho config. blecho…

… works
panda-re · Nov 24, 2018 · 4af59d9 · 4af59d9
1 parent ae2a69a
commit 4af59d9
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 486 deletions.
diff --git a/scripts/lava.py b/scripts/lava.py
@@ -489,21 +489,23 @@ def run_lavatool(bug_list, lp, host_file, project, llvm_src, filename,
     main_files = ','.join([join(lp.bugs_build, f)
                            for f in project['main_file']])
 
-    # Todo either paramaterize here or hardcode everywhere else
-    fninstr = join(join(project['directory'], project['name']), "fninstr")
 
     cmd = [
         lp.lava_tool, '-action=inject', '-bug-list=' + bug_list_str,
         '-src-prefix=' + lp.bugs_build, '-db=' + db_name,
         '-main-files=' + main_files, join(lp.bugs_build, filename)]
+
+    # Todo either paramaterize here or hardcode everywhere else
+    # For now, lavaTool will only work if it has a whitelist, so we always pass this
+    fninstr = join(join(project['directory'], project['name']), "fninstr")
+    cmd.append('-lava-wl=' + fninstr)
+
     if lt_debug:
         cmd.append("-debug")
     if dataflow:
         cmd.append('-arg_dataflow')
     if knobTrigger > 0:
         cmd.append('-kt')
-    if project["preprocessed"]:
-        cmd.append('-lava-wl=' + fninstr)
     if competition:
         cmd.append('-competition')
     if randseed:

diff --git a/target_bins/blecho.tar.gz b/target_bins/blecho.tar.gz
diff --git a/target_configs/blecho/blecho.json b/target_configs/blecho/blecho.json
@@ -1,7 +1,7 @@
 {
   "name": "blecho",
   "db": "blecho",
-  "preprocessed" : true,
+  "preprocessed" : false,
   "dataflow": true,
 
   "tarfile": "blecho.tar.gz",