From d83890c0c2c95da9e190a8f9a7ddc29cd621bef7 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
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.
---
 pgsql/custom/makefile     | 2 +-
 pgsql/database/makefile   | 2 +-
 pgsql/index/makefile      | 2 +-
 pgsql/native/makefile     | 2 +-
 pgsql/template/makefile   | 2 +-
 pgsql/truncation/makefile | 2 +-
 pgsql/types/makefile      | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pgsql')

diff --git a/pgsql/custom/makefile b/pgsql/custom/makefile
index 27a4a34..f934bdb 100644
--- a/pgsql/custom/makefile
+++ b/pgsql/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/pgsql/database/makefile b/pgsql/database/makefile
index f112d4d..585aaed 100644
--- a/pgsql/database/makefile
+++ b/pgsql/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/pgsql/index/makefile b/pgsql/index/makefile
index 89b6f09..a97bd27 100644
--- a/pgsql/index/makefile
+++ b/pgsql/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/pgsql/native/makefile b/pgsql/native/makefile
index 8f64144..9e625d7 100644
--- a/pgsql/native/makefile
+++ b/pgsql/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/pgsql/template/makefile b/pgsql/template/makefile
index f556c26..3367c4a 100644
--- a/pgsql/template/makefile
+++ b/pgsql/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/pgsql/truncation/makefile b/pgsql/truncation/makefile
index 055aa6f..5f8d286 100644
--- a/pgsql/truncation/makefile
+++ b/pgsql/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/pgsql/types/makefile b/pgsql/types/makefile
index eb173ec..f20ae1e 100644
--- a/pgsql/types/makefile
+++ b/pgsql/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)
-- 
cgit v1.1