From: dan <dan@noemail.net>
Date: Fri, 4 Nov 2016 07:25:43 +0000 (+0000)
Subject: Fix a test case in vacuum5.test so that it works with the in-memory journal
X-Git-Tag: version-3.16.0~150
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=792557ac67f1c807af1d83267f268d135ee6a200;p=thirdparty%2Fsqlite.git

Fix a test case in vacuum5.test so that it works with the in-memory journal
permutation.

FossilOrigin-Name: 81c86401463df6be4ac21987b3b1703e38ab933b
---

diff --git a/manifest b/manifest
index 726c660aff..da7b183ab1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Replace\sa\scouple\smore\sreferences\sto\sTcl\s8.5\sin\sthe\sWindows\sbuild\stools.
-D 2016-11-03T21:35:10.155
+C Fix\sa\stest\scase\sin\svacuum5.test\sso\sthat\sit\sworks\swith\sthe\sin-memory\sjournal\npermutation.
+D 2016-11-04T07:25:43.726
 F Makefile.in 6fd48ffcf7c2deea7499062d1f3747f986c19678
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc e0217f2d35a0448abbe4b066132ae20136e8b408
@@ -1345,7 +1345,7 @@ F test/vacuum.test ce91c39f7f91a4273bf620efad21086b5aa6ef1d
 F test/vacuum2.test aa048abee196c16c9ba308465494009057b79f9b
 F test/vacuum3.test 77ecdd54592b45a0bcb133339f99f1ae0ae94d0d
 F test/vacuum4.test d3f8ecff345f166911568f397d2432c16d2867d9
-F test/vacuum5.test 49d9febcb6e13c3ac5b96d8df6736f9b85d9bf70
+F test/vacuum5.test c87234e8ca4107f349da4edbeda3e4ea5adc93f3
 F test/vacuummem.test 7b42abb3208bd82dd23a7536588396f295a314f2
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
@@ -1529,7 +1529,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 3ca80010397676eca57c8a4c9b3a9c2c40629663
-R d949f61d4b25495f5b01912b96f2a42b
-U mistachkin
-Z 67303d4014c26477179ef9d2cbf9b1fe
+P 1d0e43c549c36d0919a18d61285e94cad29e7a07
+R e8d6a4378d7e8684c490ab3e02196987
+U dan
+Z 85e0796babcc520647a9671cf08776f6
diff --git a/manifest.uuid b/manifest.uuid
index 5c7119b539..89753f6d24 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1d0e43c549c36d0919a18d61285e94cad29e7a07
\ No newline at end of file
+81c86401463df6be4ac21987b3b1703e38ab933b
\ No newline at end of file
diff --git a/test/vacuum5.test b/test/vacuum5.test
index 7cc823cb7e..8e76a9393c 100644
--- a/test/vacuum5.test
+++ b/test/vacuum5.test
@@ -115,7 +115,7 @@ do_catchsql_test vacuum5-2.0 {
 #-------------------------------------------------------------------------
 # Test that a temp file is opened as part of VACUUM.
 #
-if {$::TEMP_STORE<3} {
+if {$::TEMP_STORE<3 && [permutation]!="inmemory_journal"} {
   db close
   testvfs tvfs 
   tvfs filter xOpen