From 6cd8b9f561b912f264ba4f723845935c40a3cb95 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 21 Jun 2013 10:39:59 +0200
Subject: Add support for running tests in dynamic multi-database mode

Only possible in the development build system at this stage.
---
 common/transaction/basics/makefile   | 15 +++++----------
 common/transaction/callback/makefile | 15 +++++----------
 2 files changed, 10 insertions(+), 20 deletions(-)

(limited to 'common/transaction')

diff --git a/common/transaction/basics/makefile b/common/transaction/basics/makefile
index a399e8c..07b1ba6 100644
--- a/common/transaction/basics/makefile
+++ b/common/transaction/basics/makefile
@@ -11,11 +11,6 @@ cxx_od  := $(cxx_obj:.o=.o.d)
 common.l             := $(out_root)/libcommon/common/common.l
 common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Build.
 #
 $(driver): $(cxx_obj) $(common.l)
@@ -46,11 +41,11 @@ $(dist):
 
 # Test.
 #
-$(test): $(driver) $(src_base)/test.std
-	$(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)
+ifneq ($(db_id),common)
+$(eval $(call test-schemaless-rule))
+else
+$(foreach d,$(databases),$(eval $(call test-schemaless-rule,$d)))
+endif
 
 # Clean.
 #
diff --git a/common/transaction/callback/makefile b/common/transaction/callback/makefile
index e60c936..012dd2f 100644
--- a/common/transaction/callback/makefile
+++ b/common/transaction/callback/makefile
@@ -11,11 +11,6 @@ cxx_od  := $(cxx_obj:.o=.o.d)
 common.l             := $(out_root)/libcommon/common/common.l
 common.l.cpp-options := $(out_root)/libcommon/common/common.l.cpp-options
 
-driver  := $(out_base)/driver
-dist    := $(out_base)/.dist
-test    := $(out_base)/.test
-clean   := $(out_base)/.clean
-
 # Build.
 #
 $(driver): $(cxx_obj) $(common.l)
@@ -46,11 +41,11 @@ $(dist):
 
 # Test.
 #
-$(test): $(driver) $(src_base)/test.std
-	$(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)
+ifneq ($(db_id),common)
+$(eval $(call test-schemaless-rule))
+else
+$(foreach d,$(databases),$(eval $(call test-schemaless-rule,$d)))
+endif
 
 # Clean.
 #
-- 
cgit v1.1