From 15ca9e3e8c0c7642656bd3a9c82e2b105b936f19 Mon Sep 17 00:00:00 2001 From: drh Date: Wed, 14 Mar 2018 15:06:42 +0000 Subject: [PATCH] Disable one of the test cases from check-in [21ecbce1378f3cc4] when API_ARMOR is not enabled. FossilOrigin-Name: 8fb23d4281915b4507e4d42a300f4b5f958ad88ad408218659c7459775d7b114 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/dbstatus.test | 7 ++++--- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/manifest b/manifest index 9a05c02d0e..42454216e6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Improve\sdetection\sof\sout-of-range\sparameters\sin\ssqlite3_stmt_status()\sfor\nSQLITE_ENABLE_API_ARMOR\sbuilds. -D 2018-03-14T08:27:39.022 +C Disable\sone\sof\sthe\stest\scases\sfrom\scheck-in\s[21ecbce1378f3cc4]\swhen\nAPI_ARMOR\sis\snot\senabled. +D 2018-03-14T15:06:42.860 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3 @@ -741,7 +741,7 @@ F test/date.test 9b73bbeb1b82d9c1f44dec5cf563bf7da58d2373 F test/date2.test 74c234bece1b016e94dd4ef9c8cc7a199a8806c0e2291cab7ba64bace6350b10 F test/dbfuzz.c 73047c920d6210e5912c87cdffd9a1c281d4252e F test/dbpage.test dbf50a4d361f9e45a979432c727506065113124478a7d2db12074fa655e65d6c -F test/dbstatus.test 76e317d26476ffba00faa724f383b97e6f9b7d037270fc924f15b6cd4d0bd99d +F test/dbstatus.test c15fa97f743dac7ce996814c84b56317e138895ee15ce27f15b608aa6924c90a F test/dbstatus2.test e93ab03bfae6d62d4d935f20de928c19ca0ed0ab F test/default.test 0cb49b1c315a0d81c81d775e407f66906a2a604d F test/delete.test acc38fca8ee4851467705b1c2cfea64cd26667e5 @@ -1712,7 +1712,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 0171d4a71ca7911a9fd409a42eeed0eda4521b6e48df5cd058364c0a736313b7 -R a2badd15fc27350d38828fa175bb36a1 -U dan -Z 1e5c4dfa2e88b466a3e12b606bfaedf6 +P 21ecbce1378f3cc4b1051628b8c1580bb807c8745a1f525bc089036af93a54af +R 15674337c0931617c995ce33bfb1e806 +U drh +Z 292f237c407ee25cacfa05dd8c59e736 diff --git a/manifest.uuid b/manifest.uuid index a5dc53cc26..57b12f99d2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -21ecbce1378f3cc4b1051628b8c1580bb807c8745a1f525bc089036af93a54af \ No newline at end of file +8fb23d4281915b4507e4d42a300f4b5f958ad88ad408218659c7459775d7b114 \ No newline at end of file diff --git a/test/dbstatus.test b/test/dbstatus.test index 5c8f41d510..57b91cda1a 100644 --- a/test/dbstatus.test +++ b/test/dbstatus.test @@ -433,8 +433,10 @@ do_test 5.1 { sqlite3_reset $::stmt } {SQLITE_OK} -do_test 5.2 { sqlite3_stmt_status $::stmt -1 0 } 0 -do_test 5.3 { sqlite3_stmt_status $::stmt 7 0 } 0 +ifcapable api_armor { + do_test 5.2 { sqlite3_stmt_status $::stmt -1 0 } 0 +} +do_test 5.3 { sqlite3_stmt_status $::stmt 0 0 } 0 do_test 5.4 { expr [sqlite3_stmt_status $::stmt 99 0]>0 } 1 @@ -453,4 +455,3 @@ if {$tn==2} breakpoint sqlite3_finalize $::stmt finish_test -