From: mistachkin Date: Fri, 6 Jan 2017 00:02:51 +0000 (+0000) Subject: Remove several non-portable tests for the deprecated temp_store_directory PRAGMA. X-Git-Tag: version-3.17.0~131 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=817be73bfc5a253972be57a71ffc2c304683f5e7;p=thirdparty%2Fsqlite.git Remove several non-portable tests for the deprecated temp_store_directory PRAGMA. FossilOrigin-Name: 28d87789141d816e0bce6d3965ce84c79b803218 --- diff --git a/manifest b/manifest index 7c8102a95e..b2cb0deb1e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\ssqlite3_column_count()\sreturns\s0\sfor\sthe\s"set"\smode\sof\s"get/set"\nPRAGMA\sstatements\sthat\sdo\snot\sreturn\sa\svalue\sin\sthat\scase\s(e.g.\spage_size,\ncache_size,\sauto_vacuum). -D 2017-01-05T20:00:08.469 +C Remove\sseveral\snon-portable\stests\sfor\sthe\sdeprecated\stemp_store_directory\sPRAGMA. +D 2017-01-06T00:02:51.046 F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da @@ -1010,7 +1010,7 @@ F test/permutations.test cd0b7bc04bf5e50d3a993d24c834d591f7d4f5fe F test/pragma.test 1e94755164a3a3264cd39836de4bebcb7809e5f8 F test/pragma2.test e5d5c176360c321344249354c0c16aec46214c9f F test/pragma3.test 14c12bc5352b1e100e0b6b44f371053a81ccf8ed -F test/pragma4.test 30533f846aa8b44d8d48f5dce2fe2b672dbb57c5 +F test/pragma4.test 79333554eb18567ae21ee1df980a5b2442d38910 F test/printf.test b3ff34e73d59124140eaf89f7672e21bc2ca5fcc F test/printf2.test 0b61566dd1c0f0b802f59dffa228c5dc5aa6b054 F test/progress.test ebab27f670bd0d4eb9d20d49cef96e68141d92fb @@ -1543,8 +1543,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 590ca83b8e8cdd5d24ed7f10f43e540aa0627f22 5c05d8ec5e895661dae2de30c73dfdeaff93511e -R 3cc0f54ce943c87173e4fcd78a65cfb2 -T +closed 5c05d8ec5e895661dae2de30c73dfdeaff93511e -U dan -Z 32693c8b1d3e16da4e9a701cf8e54e3f +P 2f57939a5583ae420b525c7e0f0dcda8626fe992 +R fe38b9aa03d8e8ab9362e6172ccc3a88 +U mistachkin +Z 07de6a6fd8f3c259d9e548da02c451b3 diff --git a/manifest.uuid b/manifest.uuid index f5231b6587..b3f7ca7a13 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2f57939a5583ae420b525c7e0f0dcda8626fe992 \ No newline at end of file +28d87789141d816e0bce6d3965ce84c79b803218 \ No newline at end of file diff --git a/test/pragma4.test b/test/pragma4.test index 2fa9bd09bc..3a4514901b 100644 --- a/test/pragma4.test +++ b/test/pragma4.test @@ -23,7 +23,7 @@ proc do_pragma_ncol_test {tn sql nCol} { } # If there is no RHS argument, the following PRAGMA statements operate as -# queries, returning a single row containing a single column. +# queries, returning a single row containing a single column. # # Or, if there is RHS argument, they return zero rows of zero columns. # @@ -54,8 +54,6 @@ foreach {tn sql} { 24 "PRAGMA schema_version = 211" 25 "PRAGMA short_column_names = 1" 26 "PRAGMA synchronous = full" - 27 "PRAGMA temp_store_directory = '/tmp'" - 28 "PRAGMA temp_store_directory = ''" 29 "PRAGMA temp_store = memory" 30 "PRAGMA user_version = 405" 31 "PRAGMA writable_schema = 1" @@ -64,7 +62,7 @@ foreach {tn sql} { # Without RHS: do_pragma_ncol_test 1.$tn.1 [lindex [split $sql =] 0] 1 - + # With RHS: do_pragma_ncol_test 1.$tn.2 $sql 0 }