Modify test file conflict2.test so that it works with the "inmemory_journal" permutation.
FossilOrigin-Name: e4164fd8f75ce1c8d63bec70db7049b68208c12c
This commit is contained in:
parent
9a01c16df8
commit
070865da8d
14
manifest
14
manifest
@ -1,5 +1,5 @@
|
||||
C Remove\san\sunnecessary\sbranch\sfrom\sthe\sUPDATE\slogic\s-\sone\sthat\swas\salso\nunreachable\sexcept\sfollowing\san\sOOM\son\sx64.
|
||||
D 2013-12-03T10:14:28.006
|
||||
C Modify\stest\sfile\sconflict2.test\sso\sthat\sit\sworks\swith\sthe\s"inmemory_journal"\spermutation.
|
||||
D 2013-12-03T10:35:00.119
|
||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||
F Makefile.in e1a9b4258bbde53f5636f4e238c65b7e11459e2b
|
||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||
@ -387,7 +387,7 @@ F test/collateA.test b8218ab90d1fa5c59dcf156efabb1b2599c580d6
|
||||
F test/colmeta.test 087c42997754b8c648819832241daf724f813322
|
||||
F test/colname.test 08948a4809d22817e0e5de89c7c0a8bd90cb551b
|
||||
F test/conflict.test 841bcf7cabbfca39c577eb8411ea8601843b46a8
|
||||
F test/conflict2.test 3ed0b6ec3c2cb8acebbc89677ea0e58c01aaa1ff
|
||||
F test/conflict2.test 0d3af4fb534fa1bd020c79960bb56e4d52655f09
|
||||
F test/conflict3.test dec0634c0f31dec9a4b01c63063e939f0cd21b6b
|
||||
F test/contrib01.test 2a1cbc0f2f48955d7d073f725765da6fbceda6b4
|
||||
F test/corrupt.test 141c39ea650c1365e85a49e402fa05cb9617fb97
|
||||
@ -1145,7 +1145,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
|
||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||
F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
|
||||
F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
|
||||
P 9d8a0e132163f7adeaabbf6baba119e159addd41
|
||||
R b80304a65eb00e702388789b1ac9934c
|
||||
U drh
|
||||
Z 888bf6726ec80b20bf3ce578518b415f
|
||||
P 72f972771457b8c8d9f859238d6a72b43f41d2c3
|
||||
R 020474fd63af79df89a67b479d50bb6b
|
||||
U dan
|
||||
Z 3e14c48cef582c6bdd39cdd39332c46a
|
||||
|
@ -1 +1 @@
|
||||
72f972771457b8c8d9f859238d6a72b43f41d2c3
|
||||
e4164fd8f75ce1c8d63bec70db7049b68208c12c
|
@ -305,6 +305,11 @@ foreach {i conf1 cmd t0 t1 t2 t3 t4} {
|
||||
15 {} {UPDATE OR ABORT} 1 {1 2 3 4} 1 0 1
|
||||
16 {} {UPDATE OR ROLLBACK} 1 {1 2 3 4} 0 0 0
|
||||
} {
|
||||
|
||||
# When using in-memory journals, no temporary files are required for
|
||||
# statement journals.
|
||||
if {[permutation] == "inmemory_journal"} { set t4 0 }
|
||||
|
||||
if {$t0} {set t1 {UNIQUE constraint failed: t1.a}}
|
||||
if {[info exists TEMP_STORE] && $TEMP_STORE==3} {
|
||||
set t3 0
|
||||
|
Loading…
x
Reference in New Issue
Block a user