From b568052d9d148a0026fbca589eed468dc3af7468 Mon Sep 17 00:00:00 2001
From: John McMaster <johndmcmaster@gmail.com>
Date: Wed, 19 Dec 2018 17:05:20 -0800
Subject: [PATCH] int_loop: mv todo build/todo

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
---
 fuzzers/050-intpips/.gitignore  | 1 -
 fuzzers/050-intpips/Makefile    | 4 ++++
 fuzzers/051-imuxlout/.gitignore | 1 -
 fuzzers/052-clkin/.gitignore    | 1 -
 fuzzers/053-ctrlin/.gitignore   | 1 -
 fuzzers/054-gfan/.gitignore     | 1 -
 fuzzers/055-gnd/.gitignore      | 1 -
 fuzzers/056-rempips/.gitignore  | 1 -
 fuzzers/057-bipips/.gitignore   | 1 -
 fuzzers/int_loop.mk             | 4 ++++
 fuzzers/int_loop.sh             | 3 +--
 fuzzers/int_loop_check.py       | 2 +-
 12 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/fuzzers/050-intpips/.gitignore b/fuzzers/050-intpips/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/050-intpips/.gitignore
+++ b/fuzzers/050-intpips/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile
index 7f64c73f..ef6a550d 100644
--- a/fuzzers/050-intpips/Makefile
+++ b/fuzzers/050-intpips/Makefile
@@ -57,8 +57,12 @@ build/todo.txt: build/pips_int_l.txt $(XRAY_DIR)/fuzzers/int_maketodo.py
 	python3 $(XRAY_DIR)/fuzzers/int_maketodo.py --db-dir build $(MAKETODO_FLAGS) |sort >build/todo_all.txt
 	cat build/todo_all.txt | sort -R > build/todo.txt.tmp
 	mv build/todo.txt.tmp build/todo.txt
+	# Per iter files
 	mkdir -p build/$(ITER)
 	cp build/todo_all.txt build/todo.txt build/$(ITER)/
+	# All in one dir for easier trending
+	mkdir -p build/todo
+	cp build/todo_all.txt build/todo.txt build/todo/
 
 # XXX: conider moving to script
 run:
diff --git a/fuzzers/051-imuxlout/.gitignore b/fuzzers/051-imuxlout/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/051-imuxlout/.gitignore
+++ b/fuzzers/051-imuxlout/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/052-clkin/.gitignore b/fuzzers/052-clkin/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/052-clkin/.gitignore
+++ b/fuzzers/052-clkin/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/053-ctrlin/.gitignore b/fuzzers/053-ctrlin/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/053-ctrlin/.gitignore
+++ b/fuzzers/053-ctrlin/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/054-gfan/.gitignore b/fuzzers/054-gfan/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/054-gfan/.gitignore
+++ b/fuzzers/054-gfan/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/055-gnd/.gitignore b/fuzzers/055-gnd/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/055-gnd/.gitignore
+++ b/fuzzers/055-gnd/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/056-rempips/.gitignore b/fuzzers/056-rempips/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/056-rempips/.gitignore
+++ b/fuzzers/056-rempips/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/057-bipips/.gitignore b/fuzzers/057-bipips/.gitignore
index a747a2b4..9482bcd3 100644
--- a/fuzzers/057-bipips/.gitignore
+++ b/fuzzers/057-bipips/.gitignore
@@ -1,3 +1,2 @@
 build
 run.ok
-todo
diff --git a/fuzzers/int_loop.mk b/fuzzers/int_loop.mk
index ef1988b2..013e7801 100644
--- a/fuzzers/int_loop.mk
+++ b/fuzzers/int_loop.mk
@@ -54,8 +54,12 @@ build/todo.txt: build/$(PIP_TYPE)_l.txt $(XRAY_DIR)/fuzzers/int_maketodo.py
 	python3 $(XRAY_DIR)/fuzzers/int_maketodo.py --pip-type $(PIP_TYPE) $(MAKETODO_FLAGS) |sort >build/todo_all.txt
 	cat build/todo_all.txt | sort -R | head -n$(TODO_N) > build/todo.txt.tmp
 	mv build/todo.txt.tmp build/todo.txt
+	# Per iter files
 	mkdir -p build/$(ITER)
 	cp build/todo_all.txt build/todo.txt build/$(ITER)/
+	# All in one dir for easier trending
+	mkdir -p build/todo
+	cp build/todo_all.txt build/todo.txt build/todo/
 
 # XXX: conider moving to script
 run:
diff --git a/fuzzers/int_loop.sh b/fuzzers/int_loop.sh
index 3cef5cc3..e231ecd1 100755
--- a/fuzzers/int_loop.sh
+++ b/fuzzers/int_loop.sh
@@ -46,7 +46,6 @@ fi
 set -ex
 MAKE=${MAKE:-make}
 echo $MAKE
-mkdir -p todo;
 i=1
 while true; do
     ${MAKE} ITER=$i cleanprj
@@ -54,7 +53,7 @@ while true; do
     if python3 ${XRAY_DIR}/fuzzers/int_loop_check.py $check_args ; then
         break
     fi
-    if [ -f todo/timeout ] ; then
+    if [ -f build/todo/timeout ] ; then
         echo "ERROR: timeout"
         exit 1
     fi
diff --git a/fuzzers/int_loop_check.py b/fuzzers/int_loop_check.py
index 33533b69..f03da82e 100644
--- a/fuzzers/int_loop_check.py
+++ b/fuzzers/int_loop_check.py
@@ -120,7 +120,7 @@ def main():
     )
 
     parser.add_argument('--verbose', action='store_true', help='')
-    parser.add_argument('--todo-dir', default="todo", help='')
+    parser.add_argument('--todo-dir', default="build/todo", help='')
     parser.add_argument(
         '--min-iters', default=None, help='Minimum total number of iterations')
     parser.add_argument(