From: drh Date: Mon, 2 May 2016 16:59:49 +0000 (+0000) Subject: Fix a test case in temptable2.test so that it works on systems that X-Git-Tag: version-3.13.0~44 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b1c6995c58cc3ab59539a6a2254045dad9877ef7;p=thirdparty%2Fsqlite.git Fix a test case in temptable2.test so that it works on systems that lack a coherient cache (ex: OpenBSD) and thus do not support the "PRAGMA mmap_size" command. FossilOrigin-Name: 088cf83872f6477c3b297c58d6f8a5def7025daf --- diff --git a/manifest b/manifest index 8fad26fa93..d418547198 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sharmless\sLLVM\scompiler\swarnings\sin\sthe\ssrcck1.c\sutility\sprogram\sused\nduring\sthe\sbuild\sprocess. -D 2016-05-02T13:57:19.631 +C Fix\sa\stest\scase\sin\stemptable2.test\sso\sthat\sit\sworks\son\ssystems\sthat\nlack\sa\scoherient\scache\s(ex:\sOpenBSD)\sand\sthus\sdo\snot\ssupport\sthe\n"PRAGMA\smmap_size"\scommand. +D 2016-05-02T16:59:49.933 F Makefile.in 9e816d0323e418fbc0f8b2c05fc14e0b3763d9e8 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 71b8b16cf9393f68e2e2035486ca104872558836 @@ -1113,7 +1113,7 @@ F test/tclsqlite.test e1306001a0ca92250b691ea6d3cecaca5b6342aa F test/tempdb.test bd92eba8f20e16a9136e434e20b280794de3cdb6 F test/tempfault.test 0c0d349c9a99bf5f374655742577f8712c647900 F test/temptable.test d2c9b87a54147161bcd1822e30c1d1cd891e5b30 -F test/temptable2.test c3d8c138f493207612960bbd6a8c50e84975e2ee +F test/temptable2.test efeb3ce7aaf515a1f8ebf5e27390426fb977f998 F test/temptrigger.test 8ec228b0db5d7ebc4ee9b458fc28cb9e7873f5e1 F test/tester.tcl 3ace46dee55f07e28a1e3ab03258b929fefcee5b F test/thread001.test 9f22fd3525a307ff42a326b6bc7b0465be1745a5 @@ -1486,7 +1486,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 3f221f592a9a19009076e568566c59801cd3fc32 -R 9e19502e796cc0b447ced5695bd13d5a +P e4af967533f290862dfba1d9ef44d4c9ddd8a01b +R cf9611bb2e200af1ab3bcf6e6340a559 U drh -Z 98cb934422c4b3de5638d36de23360d8 +Z af0809554b03e07ad79015deb62b6895 diff --git a/manifest.uuid b/manifest.uuid index b95adc4417..d5de45a24b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -e4af967533f290862dfba1d9ef44d4c9ddd8a01b \ No newline at end of file +088cf83872f6477c3b297c58d6f8a5def7025daf \ No newline at end of file diff --git a/test/temptable2.test b/test/temptable2.test index 890b3b996d..72bcf1ac50 100644 --- a/test/temptable2.test +++ b/test/temptable2.test @@ -343,14 +343,15 @@ do_execsql_test 10.1 { INSERT INTO t2 VALUES(3, 4); } -if {[permutation]!="journaltest"} { - # The journaltest permutation does not support mmap, so this part of - # the test is omitted. - do_execsql_test 10.2 { PRAGMA mmap_size = 512000 } 512000 +ifcapable mmap { + if {[permutation]!="journaltest"} { + # The journaltest permutation does not support mmap, so this part of + # the test is omitted. + do_execsql_test 10.2 { PRAGMA mmap_size = 512000 } 512000 + } } do_execsql_test 10.3 { SELECT * FROM t2 } {1 2 3 4} do_execsql_test 10.4 { PRAGMA integrity_check } ok finish_test -