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/makefile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'common/makefile')

diff --git a/common/makefile b/common/makefile
index ebf969a..44adcc7 100644
--- a/common/makefile
+++ b/common/makefile
@@ -57,10 +57,7 @@ cxx11_tests  := session/custom
 
 no_dist_tests := changelog include
 
-default   := $(out_base)/
-dist      := $(out_base)/.dist
-test      := $(out_base)/.test
-clean     := $(out_base)/.clean
+no_multi_tests := changelog include
 
 $(default):
 $(call include,$(bld_root)/cxx/standard.make) # cxx_standard
@@ -72,6 +69,10 @@ ifeq ($(cxx_standard),c++11)
 build_tests += $(cxx11_tests)
 endif
 
+ifeq ($(db_id),common)
+build_tests := $(filter-out $(no_multi_tests),$(build_tests))
+endif
+
 $(default): $(addprefix $(out_base)/,$(addsuffix /,$(build_tests)))
 
 name := common
@@ -89,6 +90,11 @@ $(dist): $(addprefix $(out_base)/,$(addsuffix /.dist,$(all_tests)))
 	$(call meta-vctest,$(name)-mysql-vc10.sln,test.bat)
 
 $(test): $(addprefix $(out_base)/,$(addsuffix /.test,$(build_tests)))
+
+ifeq ($(db_id),common)
+$(foreach d,$(databases),$(eval $(call db-test-dir,$d,$(build_tests))))
+endif
+
 $(clean): $(addprefix $(out_base)/,$(addsuffix /.clean,$(all_tests)))
 
 $(call include,$(bld_root)/meta/vc9sln.make)
-- 
cgit v1.1