From 475a01f652eccea04fb8992f0c2ccb027970539d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 17 Dec 2014 15:24:31 +0200
Subject: Add support for database-specific output in tests

Use that for the bulk test.
---
 build/bootstrap.make | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'build')

diff --git a/build/bootstrap.make b/build/bootstrap.make
index 7b97d74..9f749e3 100644
--- a/build/bootstrap.make
+++ b/build/bootstrap.make
@@ -114,25 +114,27 @@ endif
 #
 
 # $1 database name in the multi-database mode and empty otherwise
+# $2 optional test.std file suffix (e.g., '-mysql' for test-mysql.std)
 #
 define test-schemaless-rule
-$$(test$(if $1,_$1)): $$(driver) $$(src_base)/test.std
+$$(test$(if $1,_$1)): $$(driver) $$(src_base)/test$2.std
 	$$(call message,test$(if $1, [$1]) $$<,$$< $1 --options-file \
 $$(dcf_root)/$(if $1,$1,$(db_id)).options >$$(out_base)/test.out)
-	$$(call message,,diff -u $$(src_base)/test.std $$(out_base)/test.out)
+	$$(call message,,diff -u $$(src_base)/test$2.std $$(out_base)/test.out)
 	$$(call message,,rm -f $$(out_base)/test.out)
 
 endef
 
 # $1 database name in the multi-database mode and empty otherwise
 # $2 optional list of schema files, by default test.sql
+# $3 optional test.std file suffix (e.g., '-mysql' for test-mysql.std)
 #
 define test-rule
-$$(test$(if $1,_$1)): $$(driver) $$(src_base)/test.std
+$$(test$(if $1,_$1)): $$(driver) $$(src_base)/test$3.std
 	$$(call schema$(if $1,-$1),$2)
 	$$(call message,test$(if $1, [$1]) $$<,$$< $1 --options-file \
 $$(dcf_root)/$(if $1,$1,$(db_id)).options >$$(out_base)/test.out)
-	$$(call message,,diff -u $$(src_base)/test.std $$(out_base)/test.out)
+	$$(call message,,diff -u $$(src_base)/test$3.std $$(out_base)/test.out)
 	$$(call message,,rm -f $$(out_base)/test.out)
 
 endef
-- 
cgit v1.1