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

Remove MAKEFLAGS 

Signed-off-by: John McMaster <johndmcmaster@gmail.com>
This commit is contained in:
John McMaster 2018-12-11 21:36:42 -08:00
parent 37202994e0
commit c63f47198a
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuzzers/050-intpips/Makefile
View File

@ -56,7 +56,7 @@ build/todo.txt: build/pips_int_l.txt $(XRAY_DIR)/fuzzers/int_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)" QUICK=$(QUICK) $(XRAY_DIR)/fuzzers/int_loop.sh --check-args "$(CHECK_ARGS)"
touch run.ok
clean:

2
fuzzers/int_loop.mk
View File

@ -54,7 +54,7 @@ build/todo.txt: build/$(PIP_TYPE)_l.txt $(XRAY_DIR)/fuzzers/int_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)" --iter-pushdb
XRAY_DIR=${XRAY_DIR} MAKE="$(MAKE)" QUICK=$(QUICK) $(XRAY_DIR)/fuzzers/int_loop.sh --check-args "$(CHECK_ARGS)" --iter-pushdb
touch run.ok
clean:

12
fuzzers/int_loop.sh
View File

@ -45,14 +45,12 @@ fi
set -ex
MAKE=${MAKE:-make}
MAKEFLAGS=${MAKEFLAGS:-}
echo "make: ${MAKE} ${MAKEFLAGS}"
echo $MAKE
mkdir -p todo;
i=1
while true; do
${MAKE} ${MAKEFLAGS} ITER=$i cleanprj
${MAKE} ${MAKEFLAGS} ITER=$i build/todo.txt
${MAKE} ITER=$i cleanprj
${MAKE} ITER=$i build/todo.txt
if python3 ${XRAY_DIR}/fuzzers/int_loop_check.py $check_args ; then
break
fi
@ -63,9 +61,9 @@ while true; do
cp build/todo.txt todo/${i}.txt;
cp build/todo_all.txt todo/${i}_all.txt;
if ${MAKE} ${MAKEFLAGS} ITER=$i database; then
if ${MAKE} ITER=$i database; then
if $iter_pushdb ; then
${MAKE} ${MAKEFLAGS} pushdb
${MAKE} pushdb
fi
fi;
if [ "$QUICK" = "Y" ] ; then
@ -75,7 +73,7 @@ while true; do
i=$((i+1));
done;
if $end_pushdb ; then
${MAKE} ${MAKEFLAGS} pushdb
${MAKE} pushdb
fi
exit 0