From 656fde07c1ed0f735e858609c9a0fecafa902fb1 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Wed, 7 Nov 2018 19:13:28 -0800 Subject: [PATCH] clb.mk: fix fuzzer include, seg .rdb => .db Signed-off-by: John McMaster --- fuzzers/015-clbnffmux/Makefile | 2 +- fuzzers/016-clbnoutmux/Makefile | 2 +- fuzzers/017-clbprecyinit/Makefile | 2 +- fuzzers/clb.mk | 15 ++++++++++++--- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/fuzzers/015-clbnffmux/Makefile b/fuzzers/015-clbnffmux/Makefile index df45a018..273ae54d 100644 --- a/fuzzers/015-clbnffmux/Makefile +++ b/fuzzers/015-clbnffmux/Makefile @@ -1,4 +1,4 @@ N := 1 -DBFIXUP := ${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --zero-tile-types clblx +CLB_DBFIXUP=Y include ../clb.mk diff --git a/fuzzers/016-clbnoutmux/Makefile b/fuzzers/016-clbnoutmux/Makefile index df45a018..273ae54d 100644 --- a/fuzzers/016-clbnoutmux/Makefile +++ b/fuzzers/016-clbnoutmux/Makefile @@ -1,4 +1,4 @@ N := 1 -DBFIXUP := ${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --zero-tile-types clblx +CLB_DBFIXUP=Y include ../clb.mk diff --git a/fuzzers/017-clbprecyinit/Makefile b/fuzzers/017-clbprecyinit/Makefile index df45a018..273ae54d 100644 --- a/fuzzers/017-clbprecyinit/Makefile +++ b/fuzzers/017-clbprecyinit/Makefile @@ -1,4 +1,4 @@ N := 1 -DBFIXUP := ${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --zero-tile-types clblx +CLB_DBFIXUP=Y include ../clb.mk diff --git a/fuzzers/clb.mk b/fuzzers/clb.mk index 703161d9..4652ff44 100644 --- a/fuzzers/clb.mk +++ b/fuzzers/clb.mk @@ -1,10 +1,19 @@ N ?= 1 DBFIXUP ?= -include fuzzer.mk +include ../fuzzer.mk -database: $(SPECIMENS_OK) - ${XRAY_SEGMATCH} -o build/segbits_clblx.db $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) +database: build/segbits_clbx.db + +build/segbits_clbx.rdb: $(SPECIMENS_OK) + ${XRAY_SEGMATCH} -o build/segbits_clbx.rdb $(addsuffix /segdata_clbl[lm]_[lr].txt,$(SPECIMENS)) + +build/segbits_clbx.db: build/segbits_clbx.rdb +ifeq ($(CLB_DBFIXUP),Y) + ${XRAY_DBFIXUP} --db_root build --zero-db bits.dbf --seg-fn-in $^ --seg-fn-out $@ +else + cp $^ $@ +endif pushdb: $(DBFIXUP)