luke
/
prjxray
mirror of https://github.com/openXC7/prjxray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #362 from mcmasterg/rempips_todo 

rempips: fix todo path
This commit is contained in:
John McMaster 2018-12-19 14:43:49 -08:00 committed by GitHub
parent 0df5eb744a 71e90747d7
commit 0757dcd4c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuzzers/050-intpips/Makefile
View File

@ -53,9 +53,11 @@ build/pips_int_l.txt: $(XRAY_DIR)/fuzzers/piplist.tcl
build/todo.txt: build/pips_int_l.txt $(XRAY_DIR)/fuzzers/int_maketodo.py
# Doesn't pushdb until very end. Compare against db so far
python3 $(XRAY_DIR)/fuzzers/int_maketodo.py --db-dir build $(MAKETODO_FLAGS) >build/todo_all.txt
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
mkdir -p build/$(ITER)
cp build/todo_all.txt build/todo.txt build/$(ITER)/
# XXX: conider moving to script
run:

2
fuzzers/056-rempips/generate.py
View File

@ -12,7 +12,7 @@ ignpip = set()
todo = set()
print("Loading todo from ../todo.txt.")
with open("../todo.txt", "r") as f:
with open("../../todo.txt", "r") as f:
for line in f:
line = tuple(line.strip().split("."))
verbose and print('todo', line)

4
fuzzers/int_loop.mk
View File

@ -50,9 +50,11 @@ build/$(PIP_TYPE)_l.txt: $(XRAY_DIR)/fuzzers/piplist.tcl
# Used 1) to see if we are done 2) pips to try in generate.tcl
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) >build/todo_all.txt
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
mkdir -p build/$(ITER)
cp build/todo_all.txt build/todo.txt build/$(ITER)/
# XXX: conider moving to script
run:

2
fuzzers/int_loop.sh
View File

@ -59,8 +59,6 @@ while true; do
exit 1
fi
cp build/todo.txt todo/${i}.txt;
cp build/todo_all.txt todo/${i}_all.txt;
if ${MAKE} ITER=$i database; then
if $iter_pushdb ; then
${MAKE} pushdb