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.
---
 common/bulk/makefile        |   4 +-
 common/bulk/test-mssql.std  | 226 ++++++++++++++++++++++++++++++++++++++++++++
 common/bulk/test-mysql.std  |   0
 common/bulk/test-oracle.std | 226 ++++++++++++++++++++++++++++++++++++++++++++
 common/bulk/test-pgsql.std  |   0
 common/bulk/test-sqlite.std |   0
 common/bulk/test.std        | 226 --------------------------------------------
 7 files changed, 454 insertions(+), 228 deletions(-)
 create mode 100644 common/bulk/test-mssql.std
 create mode 100644 common/bulk/test-mysql.std
 create mode 100644 common/bulk/test-oracle.std
 create mode 100644 common/bulk/test-pgsql.std
 create mode 100644 common/bulk/test-sqlite.std
 delete mode 100644 common/bulk/test.std

(limited to 'common/bulk')

diff --git a/common/bulk/makefile b/common/bulk/makefile
index 2107cd2..481fef3 100644
--- a/common/bulk/makefile
+++ b/common/bulk/makefile
@@ -68,9 +68,9 @@ $(dist):
 # Test.
 #
 ifneq ($(db_id),common)
-$(eval $(call test-rule))
+$(eval $(call test-rule,,,-$(db_id)))
 else
-$(foreach d,$(databases),$(eval $(call test-rule,$d)))
+$(foreach d,$(databases),$(eval $(call test-rule,$d,,-sqlite)))
 endif
 
 # Clean.
diff --git a/common/bulk/test-mssql.std b/common/bulk/test-mssql.std
new file mode 100644
index 0000000..e72869d
--- /dev/null
+++ b/common/bulk/test-mssql.std
@@ -0,0 +1,226 @@
+multiple exceptions, 1 element attempted, 1 failed:
+[0] object already persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0] object already persistent
+[1] object already persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+[3] object already persistent
+
+multiple exceptions, 5 elements attempted, 5 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+[3] object already persistent
+[4] object already persistent
+
+multiple exceptions, 6 elements attempted, 6 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+[3] object already persistent
+[4] object already persistent
+[5] object already persistent
+
+multiple exceptions, 2 elements attempted, 1 failed:
+[1] object already persistent
+
+multiple exceptions, 2 elements attempted, 1 failed:
+[0] object already persistent
+
+multiple exceptions, 3 elements attempted, 2 failed:
+[1] object already persistent
+[2] object already persistent
+
+multiple exceptions, 3 elements attempted, 2 failed:
+[0] object already persistent
+[2] object already persistent
+
+multiple exceptions, 3 elements attempted, 2 failed:
+[0] object already persistent
+[1] object already persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object already persistent
+[1] object already persistent
+[3] object already persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+
+multiple exceptions, 7 elements attempted, 3 failed:
+[1] object already persistent
+[3] object already persistent
+[5] object already persistent
+
+multiple exceptions, 3 elements attempted, 1 failed:
+[2] object already persistent
+
+multiple exceptions, 1 element attempted, 1 failed:
+[0] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0] object not persistent
+[1] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+
+multiple exceptions, 5 elements attempted, 5 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+
+multiple exceptions, 6 elements attempted, 6 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+[5] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 7 elements attempted, 7 failed:
+[0-5] (some) object not persistent
+[6] object not persistent
+
+multiple exceptions, 7 elements attempted, 4 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[6] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 1 element attempted, 1 failed:
+[0] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0] object not persistent
+[1] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+
+multiple exceptions, 5 elements attempted, 5 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+
+multiple exceptions, 6 elements attempted, 6 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+[5] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 8 elements attempted, 8 failed:
+[0-7] (some) object not persistent
+
+multiple exceptions, 10 elements attempted, 6 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[6] object not persistent
+[7] object not persistent
+[8] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object changed concurrently
+[3] object changed concurrently
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object changed concurrently
+[3] object changed concurrently
+
diff --git a/common/bulk/test-mysql.std b/common/bulk/test-mysql.std
new file mode 100644
index 0000000..e69de29
diff --git a/common/bulk/test-oracle.std b/common/bulk/test-oracle.std
new file mode 100644
index 0000000..e72869d
--- /dev/null
+++ b/common/bulk/test-oracle.std
@@ -0,0 +1,226 @@
+multiple exceptions, 1 element attempted, 1 failed:
+[0] object already persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0] object already persistent
+[1] object already persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+[3] object already persistent
+
+multiple exceptions, 5 elements attempted, 5 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+[3] object already persistent
+[4] object already persistent
+
+multiple exceptions, 6 elements attempted, 6 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+[3] object already persistent
+[4] object already persistent
+[5] object already persistent
+
+multiple exceptions, 2 elements attempted, 1 failed:
+[1] object already persistent
+
+multiple exceptions, 2 elements attempted, 1 failed:
+[0] object already persistent
+
+multiple exceptions, 3 elements attempted, 2 failed:
+[1] object already persistent
+[2] object already persistent
+
+multiple exceptions, 3 elements attempted, 2 failed:
+[0] object already persistent
+[2] object already persistent
+
+multiple exceptions, 3 elements attempted, 2 failed:
+[0] object already persistent
+[1] object already persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object already persistent
+[1] object already persistent
+[3] object already persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object already persistent
+[1] object already persistent
+[2] object already persistent
+
+multiple exceptions, 7 elements attempted, 3 failed:
+[1] object already persistent
+[3] object already persistent
+[5] object already persistent
+
+multiple exceptions, 3 elements attempted, 1 failed:
+[2] object already persistent
+
+multiple exceptions, 1 element attempted, 1 failed:
+[0] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0] object not persistent
+[1] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+
+multiple exceptions, 5 elements attempted, 5 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+
+multiple exceptions, 6 elements attempted, 6 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+[5] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 7 elements attempted, 7 failed:
+[0-5] (some) object not persistent
+[6] object not persistent
+
+multiple exceptions, 7 elements attempted, 4 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[6] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 1 element attempted, 1 failed:
+[0] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0] object not persistent
+[1] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+
+multiple exceptions, 5 elements attempted, 5 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+
+multiple exceptions, 6 elements attempted, 6 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[3] object not persistent
+[4] object not persistent
+[5] object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 2 elements attempted, 2 failed:
+[0-1] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object not persistent
+[3] object not persistent
+
+multiple exceptions, 4 elements attempted, 3 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+
+multiple exceptions, 8 elements attempted, 8 failed:
+[0-7] (some) object not persistent
+
+multiple exceptions, 10 elements attempted, 6 failed:
+[0] object not persistent
+[1] object not persistent
+[2] object not persistent
+[6] object not persistent
+[7] object not persistent
+[8] object not persistent
+
+multiple exceptions, 3 elements attempted, 3 failed:
+[0-2] (some) object not persistent
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object changed concurrently
+[3] object changed concurrently
+
+multiple exceptions, 4 elements attempted, 4 failed:
+[0-2] (some) object changed concurrently
+[3] object changed concurrently
+
diff --git a/common/bulk/test-pgsql.std b/common/bulk/test-pgsql.std
new file mode 100644
index 0000000..e69de29
diff --git a/common/bulk/test-sqlite.std b/common/bulk/test-sqlite.std
new file mode 100644
index 0000000..e69de29
diff --git a/common/bulk/test.std b/common/bulk/test.std
deleted file mode 100644
index e72869d..0000000
--- a/common/bulk/test.std
+++ /dev/null
@@ -1,226 +0,0 @@
-multiple exceptions, 1 element attempted, 1 failed:
-[0] object already persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0] object already persistent
-[1] object already persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0] object already persistent
-[1] object already persistent
-[2] object already persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0] object already persistent
-[1] object already persistent
-[2] object already persistent
-[3] object already persistent
-
-multiple exceptions, 5 elements attempted, 5 failed:
-[0] object already persistent
-[1] object already persistent
-[2] object already persistent
-[3] object already persistent
-[4] object already persistent
-
-multiple exceptions, 6 elements attempted, 6 failed:
-[0] object already persistent
-[1] object already persistent
-[2] object already persistent
-[3] object already persistent
-[4] object already persistent
-[5] object already persistent
-
-multiple exceptions, 2 elements attempted, 1 failed:
-[1] object already persistent
-
-multiple exceptions, 2 elements attempted, 1 failed:
-[0] object already persistent
-
-multiple exceptions, 3 elements attempted, 2 failed:
-[1] object already persistent
-[2] object already persistent
-
-multiple exceptions, 3 elements attempted, 2 failed:
-[0] object already persistent
-[2] object already persistent
-
-multiple exceptions, 3 elements attempted, 2 failed:
-[0] object already persistent
-[1] object already persistent
-
-multiple exceptions, 4 elements attempted, 3 failed:
-[0] object already persistent
-[1] object already persistent
-[3] object already persistent
-
-multiple exceptions, 4 elements attempted, 3 failed:
-[0] object already persistent
-[1] object already persistent
-[2] object already persistent
-
-multiple exceptions, 7 elements attempted, 3 failed:
-[1] object already persistent
-[3] object already persistent
-[5] object already persistent
-
-multiple exceptions, 3 elements attempted, 1 failed:
-[2] object already persistent
-
-multiple exceptions, 1 element attempted, 1 failed:
-[0] object not persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0] object not persistent
-[1] object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[3] object not persistent
-
-multiple exceptions, 5 elements attempted, 5 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[3] object not persistent
-[4] object not persistent
-
-multiple exceptions, 6 elements attempted, 6 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[3] object not persistent
-[4] object not persistent
-[5] object not persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0-1] (some) object not persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0-1] (some) object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0-2] (some) object not persistent
-[3] object not persistent
-
-multiple exceptions, 4 elements attempted, 3 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-
-multiple exceptions, 7 elements attempted, 7 failed:
-[0-5] (some) object not persistent
-[6] object not persistent
-
-multiple exceptions, 7 elements attempted, 4 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[6] object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 1 element attempted, 1 failed:
-[0] object not persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0] object not persistent
-[1] object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[3] object not persistent
-
-multiple exceptions, 5 elements attempted, 5 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[3] object not persistent
-[4] object not persistent
-
-multiple exceptions, 6 elements attempted, 6 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[3] object not persistent
-[4] object not persistent
-[5] object not persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0-1] (some) object not persistent
-
-multiple exceptions, 2 elements attempted, 2 failed:
-[0-1] (some) object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0-2] (some) object not persistent
-[3] object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0-2] (some) object not persistent
-[3] object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0-2] (some) object not persistent
-[3] object not persistent
-
-multiple exceptions, 4 elements attempted, 3 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-
-multiple exceptions, 8 elements attempted, 8 failed:
-[0-7] (some) object not persistent
-
-multiple exceptions, 10 elements attempted, 6 failed:
-[0] object not persistent
-[1] object not persistent
-[2] object not persistent
-[6] object not persistent
-[7] object not persistent
-[8] object not persistent
-
-multiple exceptions, 3 elements attempted, 3 failed:
-[0-2] (some) object not persistent
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0-2] (some) object changed concurrently
-[3] object changed concurrently
-
-multiple exceptions, 4 elements attempted, 4 failed:
-[0-2] (some) object changed concurrently
-[3] object changed concurrently
-
-- 
cgit v1.1