1 files changed, 12 insertions, 8 deletions
diff --git a/chromium/third_party/sqlite/src/ext/rbu/rbuexlock.test b/chromium/third_party/sqlite/src/ext/rbu/rbuexlock.test
index eddcdc115fc..27fd6c4ba2f 100644
--- a/chromium/third_party/sqlite/src/ext/rbu/rbuexlock.test
+++ b/chromium/third_party/sqlite/src/ext/rbu/rbuexlock.test
@@ -11,11 +11,15 @@
 #
 
 source [file join [file dirname [info script]] rbu_common.tcl]
+if_no_rbu_support { finish_test ; return }
 set ::testprefix rbuexlock
 
 db close
-sqlite3_shutdown
-sqlite3_config_uri 1
+
+set journalmode delete
+if {[permutation]=="inmemory_journal"} {
+  set journalmode memory
+}
 
 # Create a simple RBU database. That expects to write to a table:
 #
@@ -64,7 +68,7 @@ do_test 1.2.0 {
 do_catchsql_test 1.2.1 { SELECT * FROM t1 } {0 {1 2 3}}
 do_test 1.2.2 {
   db eval {PRAGMA journal_mode}
-} {delete}
+} $journalmode
 
 do_test 1.3.0 {
   while {[file exists test.db-wal]==0} {
@@ -74,7 +78,7 @@ do_test 1.3.0 {
 do_catchsql_test 1.3.1 { SELECT * FROM t1 } {1 {database is locked}}
 do_test 1.3.2 {
   db eval {PRAGMA journal_mode}
-} {delete}
+} $journalmode
 
 
 do_test 1.4.0 {
@@ -83,7 +87,7 @@ do_test 1.4.0 {
 do_catchsql_test 1.4.1 { SELECT * FROM t1 } {1 {database is locked}}
 do_test 1.4.2 {
   db eval {PRAGMA journal_mode}
-} {delete}
+} $journalmode
 
 
 rbu close
@@ -98,7 +102,7 @@ do_test 1.5.1 {
 do_catchsql_test 1.5.2 { SELECT * FROM t1 } {1 {database is locked}}
 do_test 1.5.2 {
   db eval {PRAGMA journal_mode}
-} {delete}
+} $journalmode
 
 
 do_test 1.6.0 {
@@ -107,7 +111,7 @@ do_test 1.6.0 {
 do_catchsql_test 1.6.1 { SELECT * FROM t1 } {1 {database is locked}}
 do_test 1.6.2 {
   db eval {PRAGMA journal_mode}
-} {delete}
+} $journalmode
 
 do_test 1.7.0 {
   while {[rbu step]=="SQLITE_OK"} {}
@@ -116,7 +120,7 @@ do_test 1.7.0 {
 do_catchsql_test 1.7.2 { SELECT count(*) FROM t1 } {0 9}
 do_test 1.7.2 {
   db eval {PRAGMA journal_mode}
-} {delete}
+} $journalmode
 
 reset_db
 do_execsql_test 2.0 {