summaryrefslogtreecommitdiff
path: root/test/capi3c.test
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2013-01-17 14:23:24 -0500
committerHans-Christoph Steiner <hans@eds.org>2013-01-17 14:23:24 -0500
commit4f9313b1de21a03df32bfba4d94207c78a2171b0 (patch)
tree6a637dd4dde653f870346a37ec6555eb0574949a /test/capi3c.test
parent9da5e9acd37e51b86429d938e7e6a64ffb02da84 (diff)
parent1b5ba8e022836fa8ab93bc90df1b34a29ea6e134 (diff)
Merge tag 'upstream/2.1.1'
Upstream version 2.1.1 Conflicts: .gitignore
Diffstat (limited to 'test/capi3c.test')
-rw-r--r--test/capi3c.test2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/capi3c.test b/test/capi3c.test
index 4092091..14545c0 100644
--- a/test/capi3c.test
+++ b/test/capi3c.test
@@ -751,6 +751,7 @@ foreach {code english} $code2english {
}
# Test the error message when a "real" out of memory occurs.
+if { [permutation] != "nofaultsim" } {
ifcapable memdebug {
do_test capi3c-10-1 {
sqlite3 db test.db
@@ -771,6 +772,7 @@ ifcapable memdebug {
db close
sqlite3_memdebug_fail -1
}
+}
# The following tests - capi3c-11.* - test that a COMMIT or ROLLBACK
# statement issued while there are still outstanding VMs that are part of