Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(172)

Unified Diff: third_party/sqlite/src/test/capi3c.test

Issue 6990047: Import SQLite 3.7.6.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/sqlite/src/test/capi3b.test ('k') | third_party/sqlite/src/test/capi3d.test » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/sqlite/src/test/capi3c.test
diff --git a/third_party/sqlite/src/test/capi3c.test b/third_party/sqlite/src/test/capi3c.test
index 1bcc4373c2a578043de5337758afb54af76c8262..af9794380f251d72023b8a5ae1dc703fc8731709 100644
--- a/third_party/sqlite/src/test/capi3c.test
+++ b/third_party/sqlite/src/test/capi3c.test
@@ -19,6 +19,11 @@
set testdir [file dirname $argv0]
source $testdir/tester.tcl
+# Do not use a codec for tests in this file, as the database file is
+# manipulated directly using tcl scripts (using the [hexio_write] command).
+#
+do_not_use_codec
+
# Return the UTF-16 representation of the supplied UTF-8 string $str.
# If $nt is true, append two 0x00 bytes as a nul terminator.
proc utf16 {str {nt 1}} {
@@ -606,7 +611,7 @@ db close
do_test capi3c-6.0 {
sqlite3 db test.db
set DB [sqlite3_connection_pointer db]
- sqlite3_key $DB xyzzy
+ if {[sqlite3 -has-codec]==0} { sqlite3_key $DB xyzzy }
set sql {SELECT a FROM t1 order by rowid}
set STMT [sqlite3_prepare_v2 $DB $sql -1 TAIL]
expr 0
@@ -653,7 +658,7 @@ if {![sqlite3 -has-codec]} {
set_file_format 5
} {}
do_test capi3c-7.2 {
- sqlite3 db test.db
+ catch { sqlite3 db test.db }
catchsql {
SELECT * FROM sqlite_master;
}
@@ -681,7 +686,7 @@ if {![sqlite3 -has-codec]} {
db close
} {}
do_test capi3c-8.3 {
- sqlite3 db test.db
+ catch { sqlite3 db test.db }
catchsql {
SELECT * FROM sqlite_master;
}
@@ -700,7 +705,7 @@ if {![sqlite3 -has-codec]} {
db close
} {};
do_test capi3c-8.5 {
- sqlite3 db test.db
+ catch { sqlite3 db test.db }
catchsql {
SELECT * FROM sqlite_master;
}
@@ -1176,7 +1181,7 @@ do_test capi3c-19.4 {
sqlite3_reset $STMT
db eval {DROP TABLE t3}
sqlite3_step $STMT
-} SQLITE_SCHEMA
+} SQLITE_ERROR
do_test capi3c-19.4.1 {
sqlite3_errmsg $DB
} {no such table: t3}
« no previous file with comments | « third_party/sqlite/src/test/capi3b.test ('k') | third_party/sqlite/src/test/capi3d.test » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698