From e2149d065f4eb5cbf9ffb606655b9f0ae990435d Mon Sep 17 00:00:00 2001
From: John McMaster <johndmcmaster@gmail.com>
Date: Tue, 11 Dec 2018 16:17:37 -0800
Subject: [PATCH] int_loop: --merge

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
---
 fuzzers/int_loop.mk |  2 +-
 fuzzers/int_loop.sh | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/fuzzers/int_loop.mk b/fuzzers/int_loop.mk
index 5ee8393a..63308e10 100644
--- a/fuzzers/int_loop.mk
+++ b/fuzzers/int_loop.mk
@@ -37,7 +37,7 @@ build/todo.txt: build/pips_int_l.txt maketodo.py
 # XXX: conider moving to script
 run:
 	$(MAKE) clean
-	XRAY_DIR=${XRAY_DIR} MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" QUICK=$(QUICK) $(XRAY_DIR)/fuzzers/int_loop.sh --check-args "$(CHECK_ARGS)"
+	XRAY_DIR=${XRAY_DIR} MAKE="$(MAKE)" MAKEFLAGS="$(MAKEFLAGS)" QUICK=$(QUICK) $(XRAY_DIR)/fuzzers/int_loop.sh --check-args "$(CHECK_ARGS)" --pushdb
 	touch run.ok
 
 clean:
diff --git a/fuzzers/int_loop.sh b/fuzzers/int_loop.sh
index d62c0394..2052e039 100755
--- a/fuzzers/int_loop.sh
+++ b/fuzzers/int_loop.sh
@@ -4,9 +4,13 @@ usage() {
     echo "Run makefile until termination condition"
     echo "usage: int_loop.sh [args]"
     echo "--check-args <args>         int_loop_check.py args"
+    # intpips ingests all segbits files at once and does a push at the end
+    # other loopers do a push every pass
+    echo "--pushdb                    make pushdb after successful make database"
 }
 
 check_args=
+pushdb=false
 while [[ $# -gt 0 ]]; do
     case "$1" in
     --check-args)
@@ -14,6 +18,10 @@ while [[ $# -gt 0 ]]; do
         shift
         shift
         ;;
+    --pushdb)
+        pushdb=true
+        shift
+        ;;
     -h|--help)
         usage
         exit 0
@@ -47,7 +55,9 @@ while true; do
     cp build/todo.txt todo/${i}.txt;
     cp build/todo_all.txt todo/${i}_all.txt;
     if ${MAKE} ${MAKEFLAGS} database; then
-        ${MAKE} ${MAKEFLAGS} pushdb;
+        if $pushdb ; then
+            ${MAKE} ${MAKEFLAGS} pushdb;
+        fi
     fi;
     if [ "$QUICK" = "Y" ] ; then
         break;