From fab51c041091555f3e34505b8be98e4842b545fb Mon Sep 17 00:00:00 2001
From: Andrew Fasano <fasano@mit.edu>
Date: Thu, 5 Sep 2019 17:51:17 -0400
Subject: [PATCH] Disable dataflow for a few targets

---
 scripts/validate.sh                   | 2 ++
 target_configs/grep/grep.json         | 6 +++---
 target_configs/jq/jq.json             | 4 ++--
 target_configs/libyaml/libyaml.json   | 4 ++--
 target_configs/tinyexpr/tinyexpr.json | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/validate.sh b/scripts/validate.sh
index b7edc9ad..8653be0a 100755
--- a/scripts/validate.sh
+++ b/scripts/validate.sh
@@ -119,6 +119,8 @@ fi
 
 ### TODO: validate that injfixupscript argument doesn't break build
 
+### TODO: validate that lava_get can be injected successfully (or just that main_file) exists
+
 
 # INSTALL
 progress "validate" 0  "Installing..."
diff --git a/target_configs/grep/grep.json b/target_configs/grep/grep.json
index caf8c625..62dafe1c 100644
--- a/target_configs/grep/grep.json
+++ b/target_configs/grep/grep.json
@@ -2,7 +2,7 @@
     "name": "grep",
     "db": "grep",
     "preprocessed": true,
-    "dataflow": true,
+    "dataflow": false,
 
     "tarfile": "grep-3.1-pre.tar.gz",
 
@@ -14,9 +14,9 @@
     "clean": "make clean",
     "install": "make install",
     "command": "{install_dir}/bin/grep '\\(.\\).\\(.\\)' {input_file}",
-    "injfixupsscript": "fixup.sh {bug_build}",
+    "COMMENT_injfixupsscript": "fixup.sh {bug_build}",
 
-    "main_file": [ "grep-pre.c" ], 
+    "main_file": [ "src/grep-pre.c" ], 
 
     "inputs": [ "inputs/hi.txt" ]
 }
diff --git a/target_configs/jq/jq.json b/target_configs/jq/jq.json
index 85f4ddf6..239d5530 100644
--- a/target_configs/jq/jq.json
+++ b/target_configs/jq/jq.json
@@ -2,7 +2,7 @@
     "name": "jq",
     "db": "jq",
     "preprocessed": "true",
-    "dataflow": "true",
+    "dataflow": "false",
 
     "tarfile": "jq-1.6-pre.tar.gz",
 
@@ -14,7 +14,7 @@
     "clean": "make clean",
     "install": "make install",
     "command": "{install_dir}/bin/jq -eSCr . {input_file}",
-    "injfixupsscript": "fixup.sh {bug_build}",
+    "COMMENT_injfixupsscript": "fixup.sh {bug_build}",
 
     "main_file": [ "src/main-pre.c" ],
 
diff --git a/target_configs/libyaml/libyaml.json b/target_configs/libyaml/libyaml.json
index 8a6483bb..3317cd99 100644
--- a/target_configs/libyaml/libyaml.json
+++ b/target_configs/libyaml/libyaml.json
@@ -2,7 +2,7 @@
     "name": "libyaml",
     "db": "libyaml",
     "preprocessed": "true",
-    "dataflow": "true",
+    "dataflow": "false",
 
     "tarfile": "libyaml-pre.tar.gz",
 
@@ -15,7 +15,7 @@
     "install": "make install",
     "command": "{install_dir}/bin/libyaml -c -u {input_file}",
 
-    "injfixupsscript": "fixup.sh {bug_build}",
+    "COMMENT_injfixupsscript": "fixup.sh {bug_build}",
 
     "main_file": [ "src/parser.c" ],
 
diff --git a/target_configs/tinyexpr/tinyexpr.json b/target_configs/tinyexpr/tinyexpr.json
index 1eb7d631..7062b27e 100644
--- a/target_configs/tinyexpr/tinyexpr.json
+++ b/target_configs/tinyexpr/tinyexpr.json
@@ -2,7 +2,7 @@
     "name": "tinyexpr",
     "db": "tinyexpr",
     "preprocessed": true,
-    "dataflow": true,
+    "dataflow": false,
 
     "tarfile": "tinyexpr-pre.tar.gz",