From 2b03a8fa879bd583c889b101f567927a959cdc0f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Thu, 6 Jun 2013 12:46:23 +0200 Subject: Use fixed options file names in database-specific tests --- mssql/custom/makefile | 2 +- mssql/database/makefile | 2 +- mssql/native/makefile | 2 +- mssql/query/makefile | 2 +- mssql/template/makefile | 2 +- mssql/types/makefile | 2 +- mysql/custom/makefile | 2 +- mysql/database/makefile | 2 +- mysql/index/makefile | 2 +- mysql/native/makefile | 2 +- mysql/template/makefile | 2 +- mysql/truncation/makefile | 2 +- mysql/types/makefile | 2 +- oracle/custom/makefile | 2 +- oracle/database/makefile | 2 +- oracle/native/makefile | 2 +- oracle/template/makefile | 2 +- oracle/types/makefile | 2 +- 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 +- sqlite/custom/makefile | 3 +-- sqlite/database/makefile | 2 +- sqlite/native/makefile | 2 +- sqlite/template/makefile | 3 +-- sqlite/truncation/makefile | 3 +-- sqlite/types/makefile | 3 +-- 31 files changed, 31 insertions(+), 35 deletions(-) diff --git a/mssql/custom/makefile b/mssql/custom/makefile index e9fa371..9acc2f5 100644 --- a/mssql/custom/makefile +++ b/mssql/custom/makefile @@ -68,7 +68,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mssql.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/mssql/database/makefile b/mssql/database/makefile index 2e64258..e1bf4ba 100644 --- a/mssql/database/makefile +++ b/mssql/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mssql.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/mssql/native/makefile b/mssql/native/makefile index ac4e3ac..24d88ae 100644 --- a/mssql/native/makefile +++ b/mssql/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mssql.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/mssql/query/makefile b/mssql/query/makefile index 166482f..6f7106e 100644 --- a/mssql/query/makefile +++ b/mssql/query/makefile @@ -66,7 +66,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mssql.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/mssql/template/makefile b/mssql/template/makefile index a62384c..8bfaa68 100644 --- a/mssql/template/makefile +++ b/mssql/template/makefile @@ -65,7 +65,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mssql.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/mssql/types/makefile b/mssql/types/makefile index 247d7a0..58636bd 100644 --- a/mssql/types/makefile +++ b/mssql/types/makefile @@ -67,7 +67,7 @@ $(dist): # $(test): $(driver) $(src_base)/test.std $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mssql.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/custom/makefile b/mysql/custom/makefile index 2b8afb8..fa1dce3 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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 7ff07f0..63aa90d 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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 54b4974..a2ceec8 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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 2e654ba..520c7ed 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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 0a6c880..e34f486 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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 0aa9bf6..179c830 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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 61d3898..a1fa920 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/mysql.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/custom/makefile b/oracle/custom/makefile index dc9af00..7bae1fa 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/oracle.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 5873734..0eeb978 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/oracle.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 80d2fd1..9b7449e 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/oracle.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 5106239..743b405 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/oracle.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 448bcc1..ebbfc19 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/oracle.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/custom/makefile b/pgsql/custom/makefile index f934bdb..5c98b1d 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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 585aaed..490fd4e 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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 a97bd27..e030f35 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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 9e625d7..a23b4a8 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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 3367c4a..2f503a4 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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 5f8d286..099927e 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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 f20ae1e..7fe798c 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_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/pgsql.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/sqlite/custom/makefile b/sqlite/custom/makefile index 132d767..62d5539 100644 --- a/sqlite/custom/makefile +++ b/sqlite/custom/makefile @@ -64,8 +64,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/sqlite.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/sqlite/database/makefile b/sqlite/database/makefile index 66051e4..b2ec5cd 100644 --- a/sqlite/database/makefile +++ b/sqlite/database/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/sqlite.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/sqlite/native/makefile b/sqlite/native/makefile index 5c31952..0d6a314 100644 --- a/sqlite/native/makefile +++ b/sqlite/native/makefile @@ -46,7 +46,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/sqlite.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/sqlite/template/makefile b/sqlite/template/makefile index 00f3770..c4bb3f0 100644 --- a/sqlite/template/makefile +++ b/sqlite/template/makefile @@ -64,8 +64,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/sqlite.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/sqlite/truncation/makefile b/sqlite/truncation/makefile index 020e298..6cfed59 100644 --- a/sqlite/truncation/makefile +++ b/sqlite/truncation/makefile @@ -64,8 +64,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/sqlite.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/sqlite/types/makefile b/sqlite/types/makefile index f4abc56..cc6f7ff 100644 --- a/sqlite/types/makefile +++ b/sqlite/types/makefile @@ -66,8 +66,7 @@ $(dist): # Test. # $(test): $(driver) $(src_base)/test.std - $(call schema) - $(call message,test $<,$< --options-file $(dcf_root)/$(db_id).options \ + $(call message,test $<,$< --options-file $(dcf_root)/sqlite.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