aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-12-17 15:24:31 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-12-17 15:24:31 +0200
commit475a01f652eccea04fb8992f0c2ccb027970539d (patch)
tree22c1011a8c4172d7e72680ddfd1a9249fe1fe663 /common
parent32f09571e564c42c04acdba2cf139a507aa4b0da (diff)
Add support for database-specific output in tests
Use that for the bulk test.
Diffstat (limited to 'common')
-rw-r--r--common/bulk/makefile4
-rw-r--r--common/bulk/test-mssql.std (renamed from common/bulk/test.std)0
-rw-r--r--common/bulk/test-mysql.std0
-rw-r--r--common/bulk/test-oracle.std226
-rw-r--r--common/bulk/test-pgsql.std0
-rw-r--r--common/bulk/test-sqlite.std0
-rw-r--r--common/makefile2
7 files changed, 229 insertions, 3 deletions
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.std b/common/bulk/test-mssql.std
index e72869d..e72869d 100644
--- a/common/bulk/test.std
+++ b/common/bulk/test-mssql.std
diff --git a/common/bulk/test-mysql.std b/common/bulk/test-mysql.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/bulk/test-mysql.std
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
--- /dev/null
+++ b/common/bulk/test-pgsql.std
diff --git a/common/bulk/test-sqlite.std b/common/bulk/test-sqlite.std
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/common/bulk/test-sqlite.std
diff --git a/common/makefile b/common/makefile
index 04e3efa..7f99cf4 100644
--- a/common/makefile
+++ b/common/makefile
@@ -64,7 +64,7 @@ cxx11_tests := session/custom
no_dist_tests := changelog include
-no_multi_tests := bulk changelog include
+no_multi_tests := changelog include
$(default):
$(call include,$(bld_root)/cxx/standard.make) # cxx_standard