From d83890c0c2c95da9e190a8f9a7ddc29cd621bef7 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 3 Jun 2013 13:22:37 +0200 Subject: Use database name in options and driver files (build part) This way we will be able to have several databases configured at the same time, which is needed for multi-database support testing. --- common/access/makefile | 2 +- common/auto/makefile | 2 +- common/blob/makefile | 2 +- common/callback/makefile | 2 +- common/circular/multiple/makefile | 2 +- common/circular/single/makefile | 2 +- common/composite-id/makefile | 2 +- common/composite/makefile | 2 +- common/const-member/makefile | 2 +- common/const-object/makefile | 2 +- common/container/basics/makefile | 2 +- common/container/change-tracking/makefile | 2 +- common/ctor/makefile | 2 +- common/default/makefile | 2 +- common/definition/makefile | 2 +- common/enum/makefile | 2 +- common/erase-query/makefile | 2 +- common/include/makefile | 2 +- common/index/makefile | 2 +- common/inheritance/polymorphism/makefile | 2 +- common/inheritance/reuse/makefile | 2 +- common/inheritance/transient/makefile | 2 +- common/inverse/makefile | 2 +- common/lazy-ptr/makefile | 2 +- common/lifecycle/makefile | 2 +- common/no-id/makefile | 2 +- common/optimistic/makefile | 2 +- common/pragma/makefile | 2 +- common/prepared/makefile | 2 +- common/query/array/makefile | 2 +- common/query/basics/makefile | 2 +- common/readonly/makefile | 2 +- common/relationship-query/makefile | 2 +- common/relationship/makefile | 2 +- common/schema/embedded/basics/makefile | 2 +- common/schema/embedded/order/makefile | 2 +- common/schema/namespace/makefile | 2 +- common/session/cache/makefile | 2 +- common/session/custom/makefile | 2 +- common/template/makefile | 2 +- common/threads/makefile | 2 +- common/transaction/basics/makefile | 2 +- common/transaction/callback/makefile | 2 +- common/types/makefile | 2 +- common/view/makefile | 2 +- common/virtual/makefile | 2 +- common/wrapper/makefile | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) (limited to 'common') diff --git a/common/access/makefile b/common/access/makefile index d3d4438..7a8a86a 100644 --- a/common/access/makefile +++ b/common/access/makefile @@ -68,7 +68,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/auto/makefile b/common/auto/makefile index baaf756..c317894 100644 --- a/common/auto/makefile +++ b/common/auto/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/blob/makefile b/common/blob/makefile index 82d6523..ee9785f 100644 --- a/common/blob/makefile +++ b/common/blob/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/callback/makefile b/common/callback/makefile index 7f0e8aa..f7b0ab6 100644 --- a/common/callback/makefile +++ b/common/callback/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/circular/multiple/makefile b/common/circular/multiple/makefile index 5093f56..026d6db 100644 --- a/common/circular/multiple/makefile +++ b/common/circular/multiple/makefile @@ -71,7 +71,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/circular/single/makefile b/common/circular/single/makefile index 81c01a7..e5f645e 100644 --- a/common/circular/single/makefile +++ b/common/circular/single/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/composite-id/makefile b/common/composite-id/makefile index 3c557ed..1b080e3 100644 --- a/common/composite-id/makefile +++ b/common/composite-id/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/composite/makefile b/common/composite/makefile index 92da67f..1892ba1 100644 --- a/common/composite/makefile +++ b/common/composite/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/const-member/makefile b/common/const-member/makefile index 8e1780e..83a398d 100644 --- a/common/const-member/makefile +++ b/common/const-member/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/const-object/makefile b/common/const-object/makefile index 38881fa..043ab76 100644 --- a/common/const-object/makefile +++ b/common/const-object/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/container/basics/makefile b/common/container/basics/makefile index 29d70bb..baddb9f 100644 --- a/common/container/basics/makefile +++ b/common/container/basics/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/container/change-tracking/makefile b/common/container/change-tracking/makefile index 9135405..b24f8ea 100644 --- a/common/container/change-tracking/makefile +++ b/common/container/change-tracking/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/ctor/makefile b/common/ctor/makefile index 1290cb2..67f5656 100644 --- a/common/ctor/makefile +++ b/common/ctor/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/default/makefile b/common/default/makefile index 82e268f..27ad049 100644 --- a/common/default/makefile +++ b/common/default/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/definition/makefile b/common/definition/makefile index a7c87e6..837d5d6 100644 --- a/common/definition/makefile +++ b/common/definition/makefile @@ -72,7 +72,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/enum/makefile b/common/enum/makefile index ce2e6c2..466498f 100644 --- a/common/enum/makefile +++ b/common/enum/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/erase-query/makefile b/common/erase-query/makefile index 7856090..378103f 100644 --- a/common/erase-query/makefile +++ b/common/erase-query/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/include/makefile b/common/include/makefile index 3a74738..19d2705 100644 --- a/common/include/makefile +++ b/common/include/makefile @@ -53,7 +53,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/index/makefile b/common/index/makefile index c412619..82e0835 100644 --- a/common/index/makefile +++ b/common/index/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/inheritance/polymorphism/makefile b/common/inheritance/polymorphism/makefile index d250541..2be6810 100644 --- a/common/inheritance/polymorphism/makefile +++ b/common/inheritance/polymorphism/makefile @@ -71,7 +71,7 @@ $(dist): $(test): schemas := $(addprefix $(out_base)/,$(odb_hdr:.hxx=.sql)) $(test): $(driver) $(src_base)/test.std $(call schema,$(schemas)) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/inheritance/reuse/makefile b/common/inheritance/reuse/makefile index 6541680..f116b0d 100644 --- a/common/inheritance/reuse/makefile +++ b/common/inheritance/reuse/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/inheritance/transient/makefile b/common/inheritance/transient/makefile index 4e1ad99..65b1afa 100644 --- a/common/inheritance/transient/makefile +++ b/common/inheritance/transient/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/inverse/makefile b/common/inverse/makefile index ed5f1f9..6089d8d 100644 --- a/common/inverse/makefile +++ b/common/inverse/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/lazy-ptr/makefile b/common/lazy-ptr/makefile index e4424ec..b5bafcf 100644 --- a/common/lazy-ptr/makefile +++ b/common/lazy-ptr/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/lifecycle/makefile b/common/lifecycle/makefile index 0959a83..4caff60 100644 --- a/common/lifecycle/makefile +++ b/common/lifecycle/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/no-id/makefile b/common/no-id/makefile index 3c4a4aa..d56c120 100644 --- a/common/no-id/makefile +++ b/common/no-id/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/optimistic/makefile b/common/optimistic/makefile index 57836d3..9b5f06a 100644 --- a/common/optimistic/makefile +++ b/common/optimistic/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/pragma/makefile b/common/pragma/makefile index 4ce8294..563809c 100644 --- a/common/pragma/makefile +++ b/common/pragma/makefile @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/prepared/makefile b/common/prepared/makefile index 09a27cb..4c2bf28 100644 --- a/common/prepared/makefile +++ b/common/prepared/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/query/array/makefile b/common/query/array/makefile index 296e9a2..0d65398 100644 --- a/common/query/array/makefile +++ b/common/query/array/makefile @@ -68,7 +68,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/query/basics/makefile b/common/query/basics/makefile index e5ae0d1..2952b21 100644 --- a/common/query/basics/makefile +++ b/common/query/basics/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/readonly/makefile b/common/readonly/makefile index f0a0fcc..adde950 100644 --- a/common/readonly/makefile +++ b/common/readonly/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/relationship-query/makefile b/common/relationship-query/makefile index c8157c5..164b0f0 100644 --- a/common/relationship-query/makefile +++ b/common/relationship-query/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/relationship/makefile b/common/relationship/makefile index 9a8ce7d..4babd5e 100644 --- a/common/relationship/makefile +++ b/common/relationship/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/schema/embedded/basics/makefile b/common/schema/embedded/basics/makefile index 2feb937..7989195 100644 --- a/common/schema/embedded/basics/makefile +++ b/common/schema/embedded/basics/makefile @@ -66,7 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/schema/embedded/order/makefile b/common/schema/embedded/order/makefile index 941e183..e8d840d 100644 --- a/common/schema/embedded/order/makefile +++ b/common/schema/embedded/order/makefile @@ -71,7 +71,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/schema/namespace/makefile b/common/schema/namespace/makefile index 370d6ca..c1157c9 100644 --- a/common/schema/namespace/makefile +++ b/common/schema/namespace/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/session/cache/makefile b/common/session/cache/makefile index 5309cd9..c26b394 100644 --- a/common/session/cache/makefile +++ b/common/session/cache/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/session/custom/makefile b/common/session/custom/makefile index 89d2296..e822b7a 100644 --- a/common/session/custom/makefile +++ b/common/session/custom/makefile @@ -69,7 +69,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/template/makefile b/common/template/makefile index e589b35..63768df 100644 --- a/common/template/makefile +++ b/common/template/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/threads/makefile b/common/threads/makefile index 02dc303..cfd0e3f 100644 --- a/common/threads/makefile +++ b/common/threads/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/transaction/basics/makefile b/common/transaction/basics/makefile index 23932d1..b384d47 100644 --- a/common/transaction/basics/makefile +++ b/common/transaction/basics/makefile @@ -48,7 +48,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/transaction/callback/makefile b/common/transaction/callback/makefile index 2ccadcd..f4ed18b 100644 --- a/common/transaction/callback/makefile +++ b/common/transaction/callback/makefile @@ -48,7 +48,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/types/makefile b/common/types/makefile index 54c6ba3..ec58785 100644 --- a/common/types/makefile +++ b/common/types/makefile @@ -65,7 +65,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/view/makefile b/common/view/makefile index 097ae7d..bc74e97 100644 --- a/common/view/makefile +++ b/common/view/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/virtual/makefile b/common/virtual/makefile index c7d5f3f..a98a69d 100644 --- a/common/virtual/makefile +++ b/common/virtual/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) diff --git a/common/wrapper/makefile b/common/wrapper/makefile index 5e7e5ff..8511bd9 100644 --- a/common/wrapper/makefile +++ b/common/wrapper/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/db.options \ + $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ >$(out_base)/test.out) $(call message,,diff -u $(src_base)/test.std $(out_base)/test.out) $(call message,,rm -f $(out_base)/test.out) -- cgit v1.1