diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:42 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2012-09-20 18:34:42 -0400 |
| commit | 734b4f890763e4efafe865ba476c43cc8d1a2214 (patch) | |
| tree | d561d2fad0788619f4b8e230073f6af1d416934e /test/permutations.test | |
| parent | 396b08286e7bb56e0e6440aaf1345c18e72ee22e (diff) | |
| parent | 487e15dc239ccdb3344d1c99ce120e872bab4a74 (diff) | |
Merge tag 'upstream/2.0.6'
Upstream version 2.0.6
Diffstat (limited to 'test/permutations.test')
| -rw-r--r-- | test/permutations.test | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/test/permutations.test b/test/permutations.test index 7c3b026..3165ea3 100644 --- a/test/permutations.test +++ b/test/permutations.test @@ -110,8 +110,8 @@ set allquicktests [test_set $alltests -exclude { speed4p.test sqllimits1.test tkt2686.test thread001.test thread002.test thread003.test thread004.test thread005.test trans2.test vacuum3.test incrvacuum_ioerr.test autovacuum_crash.test btree8.test shared_err.test - vtab_err.test walslow.test walcrash.test - walthread.test rtree3.test indexfault.test + vtab_err.test walslow.test walcrash.test walcrash3.test + walthread.test rtree3.test indexfault.test }] if {[info exists ::env(QUICKTEST_INCLUDE)]} { set allquicktests [concat $allquicktests $::env(QUICKTEST_INCLUDE)] @@ -142,7 +142,7 @@ test_suite "valgrind" -prefix "" -description { Run the "veryquick" test suite with a couple of multi-process tests (that fail under valgrind) omitted. } -files [ - test_set $allquicktests -exclude *malloc* *ioerr* *fault* + test_set $allquicktests -exclude *malloc* *ioerr* *fault* wal.test ] -initialize { set ::G(valgrind) 1 } -shutdown { @@ -184,8 +184,8 @@ test_suite "fts3" -prefix "" -description { fts3aux1.test fts3comp1.test fts3auto.test fts4aa.test fts4content.test fts3conf.test fts3prefix.test fts3fault2.test fts3corrupt.test - fts3corrupt2.test - fts3first.test + fts3corrupt2.test fts3first.test fts4langid.test fts4merge.test + fts4check.test } @@ -530,6 +530,8 @@ test_suite "inmemory_journal" -description { # Exclude stmt.test, which expects sub-journals to use temporary files. stmt.test + zerodamage.test + # WAL mode is different. wal* tkt-2d1a5c67d.test backcompat.test }] |