Merge updates from trunk.

FossilOrigin-Name: 86ab8643969bd2e51a257d80da9316c668437f7b
2016-03-21 10:49:49 +00:00
parent 762e32bcfa ef480d37dc
commit b7c9659db3
32 changed files with 1240 additions and 330 deletions
@@ -926,19 +926,20 @@ do_test capi3-11.9.3 {
 do_test capi3-11.10 {
  sqlite3_step $STMT
 } {SQLITE_ROW}
-ifcapable !autoreset {
-  # If SQLITE_OMIT_AUTORESET is defined, then the statement must be
-  # reset() before it can be passed to step() again.
-  do_test capi3-11.11a { sqlite3_step $STMT } {SQLITE_MISUSE}
-  do_test capi3-11.11b { sqlite3_reset $STMT } {SQLITE_ABORT}
-}
 do_test capi3-11.11 {
  sqlite3_step $STMT
 } {SQLITE_DONE}
-do_test capi3-11.12 {
-  sqlite3_step $STMT
-  sqlite3_step $STMT
-} {SQLITE_ROW}
+ifcapable api_armor {
+  do_test capi3-11.12armor {
+    sqlite3_step $STMT
+    sqlite3_step $STMT
+  } {SQLITE_MISUSE}
+} else {
+  do_test capi3-11.12 {
+    sqlite3_step $STMT
+    sqlite3_step $STMT
+  } {SQLITE_ROW}
+}
 do_test capi3-11.13 {
  sqlite3_finalize $STMT
 } {SQLITE_OK}