From e525def48c4fa835597182f499e504664543fae8 Mon Sep 17 00:00:00 2001 From: Karol Gugala Date: Tue, 15 Jan 2019 18:14:02 +0100 Subject: [PATCH] fuzzers: Copy all the db files to build/database Local copy of the database is used to generate todo files. Since we were not copying all the DB files, the generated todo files contained previously solved PIPs. Signed-off-by: Karol Gugala --- fuzzers/int_loop.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fuzzers/int_loop.mk b/fuzzers/int_loop.mk index 6829f8a7..26b18863 100644 --- a/fuzzers/int_loop.mk +++ b/fuzzers/int_loop.mk @@ -42,7 +42,7 @@ ifneq ($(QUICK),Y) ${XRAY_DBFIXUP} --db-root build --clb-int # https://github.com/SymbiFlow/prjxray/issues/399 # Clobber existing .db to eliminate potential conflicts - if [ -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_clb*.db ] ; then cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_clb*.db build/database/${XRAY_DATABASE}; else bash ${XRAY_DIR}/fuzzers/int_create_empty_db.sh; fi + if [ -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db ] ; then cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}; else bash ${XRAY_DIR}/fuzzers/int_create_empty_db.sh; fi XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} int_l build/segbits_int_l.db XRAY_DATABASE_DIR=${FUZDIR}/build/database ${XRAY_MERGEDB} int_r build/segbits_int_r.db endif @@ -81,7 +81,7 @@ build/todo.txt: build/$(PIP_TYPE)_l.txt $(XRAY_DIR)/fuzzers/int_maketodo.py buil # Subsequent are based on updated db build/database/seeded: mkdir -p build/database/${XRAY_DATABASE} - if [ -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_clb*.db ] ; then cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits_clb*.db build/database/${XRAY_DATABASE}; else bash ${XRAY_DIR}/fuzzers/int_create_empty_db.sh; fi + if [ -f ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db ] ; then cp ${XRAY_DATABASE_DIR}/${XRAY_DATABASE}/segbits*.db build/database/${XRAY_DATABASE}; else bash ${XRAY_DIR}/fuzzers/int_create_empty_db.sh; fi touch build/database/seeded # XXX: conider moving to script