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 --- sqlite/custom/makefile | 3 +-- sqlite/database/makefile | 2 +- sqlite/native/makefile | 2 +- sqlite/template/makefile | 3 +-- sqlite/truncation/makefile | 3 +-- sqlite/types/makefile | 3 +-- 6 files changed, 6 insertions(+), 10 deletions(-) (limited to 'sqlite') 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