aboutsummaryrefslogtreecommitdiff
path: root/mysql
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-06-03 13:22:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-06-03 13:22:37 +0200
commitd83890c0c2c95da9e190a8f9a7ddc29cd621bef7 (patch)
treee19b17e63499e396cf592fa91758439c1c2b33e5 /mysql
parent6ec616d6ad29bcf00f3a4d9ed8bf53d44e589228 (diff)
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.
Diffstat (limited to 'mysql')
-rw-r--r--mysql/custom/makefile2
-rw-r--r--mysql/database/makefile2
-rw-r--r--mysql/index/makefile2
-rw-r--r--mysql/native/makefile2
-rw-r--r--mysql/template/makefile2
-rw-r--r--mysql/truncation/makefile2
-rw-r--r--mysql/types/makefile2
7 files changed, 7 insertions, 7 deletions
diff --git a/mysql/custom/makefile b/mysql/custom/makefile
index 91c0a89..2b8afb8 100644
--- a/mysql/custom/makefile
+++ b/mysql/custom/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/mysql/database/makefile b/mysql/database/makefile
index ef3e673..7ff07f0 100644
--- a/mysql/database/makefile
+++ b/mysql/database/makefile
@@ -46,7 +46,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/mysql/index/makefile b/mysql/index/makefile
index d3e7740..54b4974 100644
--- a/mysql/index/makefile
+++ b/mysql/index/makefile
@@ -65,7 +65,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/mysql/native/makefile b/mysql/native/makefile
index ce0a283..2e654ba 100644
--- a/mysql/native/makefile
+++ b/mysql/native/makefile
@@ -46,7 +46,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/mysql/template/makefile b/mysql/template/makefile
index c4afa1e..0a6c880 100644
--- a/mysql/template/makefile
+++ b/mysql/template/makefile
@@ -65,7 +65,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/mysql/truncation/makefile b/mysql/truncation/makefile
index 0825d67..0aa9bf6 100644
--- a/mysql/truncation/makefile
+++ b/mysql/truncation/makefile
@@ -65,7 +65,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/mysql/types/makefile b/mysql/types/makefile
index ef1fe9f..61d3898 100644
--- a/mysql/types/makefile
+++ b/mysql/types/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)