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.
---
 oracle/custom/makefile   | 2 +-
 oracle/database/makefile | 2 +-
 oracle/native/makefile   | 2 +-
 oracle/template/makefile | 2 +-
 oracle/types/makefile    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'oracle')

diff --git a/oracle/custom/makefile b/oracle/custom/makefile
index 866b4e2..dc9af00 100644
--- a/oracle/custom/makefile
+++ b/oracle/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/oracle/database/makefile b/oracle/database/makefile
index 6b0e4af..5873734 100644
--- a/oracle/database/makefile
+++ b/oracle/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/oracle/native/makefile b/oracle/native/makefile
index 5137a8a..80d2fd1 100644
--- a/oracle/native/makefile
+++ b/oracle/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/oracle/template/makefile b/oracle/template/makefile
index 19e8a34..5106239 100644
--- a/oracle/template/makefile
+++ b/oracle/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/oracle/types/makefile b/oracle/types/makefile
index d303cea..448bcc1 100644
--- a/oracle/types/makefile
+++ b/oracle/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