| Index: third_party/sqlite/src/test/backup.test
|
| diff --git a/third_party/sqlite/src/test/backup.test b/third_party/sqlite/src/test/backup.test
|
| index 0e2c26f33b8f84b4e0928f48902f61e7da33b2b6..444619c68c41b4fe6a1a9b156df11d9075993fa6 100644
|
| --- a/third_party/sqlite/src/test/backup.test
|
| +++ b/third_party/sqlite/src/test/backup.test
|
| @@ -73,7 +73,7 @@ test_contents backup-1.2 db main db main
|
| # Check that it is possible to create and finish backup operations.
|
| #
|
| do_test backup-1.3.1 {
|
| - file delete test2.db
|
| + delete_file test2.db
|
| sqlite3 db2 test2.db
|
| sqlite3_backup B db2 main db main
|
| } {B}
|
| @@ -168,8 +168,8 @@ foreach pgsz_dest {512 1024 2048} {
|
| foreach nPagePerStep {1 200} {
|
|
|
| # Open the databases.
|
| - catch { file delete test.db }
|
| - catch { file delete test2.db }
|
| + catch { delete_file test.db }
|
| + catch { delete_file test2.db }
|
| eval $zOpenScript
|
|
|
| # Set to true if copying to an in-memory destination. Copying to an
|
| @@ -279,8 +279,8 @@ foreach nSrcPg {10 64 65 66 100} {
|
| foreach nDestRow {10 100} {
|
| foreach nDestPgsz {512 1024 2048 4096} {
|
|
|
| - catch { file delete test.db }
|
| - catch { file delete test2.db }
|
| + catch { delete_file test.db }
|
| + catch { delete_file test2.db }
|
| sqlite3 db test.db
|
| sqlite3 db2 test2.db
|
|
|
| @@ -327,8 +327,8 @@ foreach nDestPgsz {512 1024 2048 4096} {
|
|
|
| #--------------------------------------------------------------------
|
| do_test backup-3.$iTest.1 {
|
| - catch { file delete -force test.db }
|
| - catch { file delete -force test2.db }
|
| + catch { forcedelete test.db }
|
| + catch { forcedelete test2.db }
|
| sqlite3 db test.db
|
| set iTab 1
|
|
|
| @@ -392,8 +392,8 @@ do_test backup-4.1.4 {
|
| } {unknown database aux}
|
|
|
| do_test backup-4.2.1 {
|
| - catch { file delete -force test3.db }
|
| - catch { file delete -force test4.db }
|
| + catch { forcedelete test3.db }
|
| + catch { forcedelete test4.db }
|
| execsql {
|
| ATTACH 'test3.db' AS aux1;
|
| CREATE TABLE aux1.t1(a, b);
|
| @@ -423,7 +423,7 @@ do_test backup-4.3.2 {
|
| } {SQLITE_BUSY}
|
| do_test backup-4.3.3 {
|
| sqlite3_errmsg db2
|
| -} {unable to close due to unfinished backup operation}
|
| +} {unable to close due to unfinalized statements or unfinished backups}
|
| do_test backup-4.3.4 {
|
| B step 50
|
| } {SQLITE_DONE}
|
| @@ -439,7 +439,7 @@ db close
|
| db2 close
|
|
|
| do_test backup-4.5.1 {
|
| - catch { file delete -force test.db }
|
| + catch { forcedelete test.db }
|
| sqlite3 db test.db
|
| sqlite3 db2 :memory:
|
| execsql {
|
| @@ -463,7 +463,7 @@ do_test backup-4.5.3 {
|
| db close
|
| db2 close
|
| #
|
| -# End of backup-5.* tests.
|
| +# End of backup-4.* tests.
|
| #---------------------------------------------------------------------
|
|
|
| #---------------------------------------------------------------------
|
| @@ -491,12 +491,12 @@ db2 close
|
| # 3) Backing up memory-to-file.
|
| #
|
| set iTest 0
|
| -file delete -force bak.db-wal
|
| +forcedelete bak.db-wal
|
| foreach {writer file} {db test.db db3 test.db db :memory:} {
|
| incr iTest
|
| - catch { file delete bak.db }
|
| + catch { delete_file bak.db }
|
| sqlite3 db2 bak.db
|
| - catch { file delete $file }
|
| + catch { delete_file $file }
|
| sqlite3 db $file
|
| sqlite3 db3 $file
|
|
|
| @@ -597,9 +597,9 @@ foreach {writer file} {db test.db db3 test.db db :memory:} {
|
| catch {db close}
|
| catch {db2 close}
|
| catch {db3 close}
|
| - catch { file delete bak.db }
|
| + catch { delete_file bak.db }
|
| sqlite3 db2 bak.db
|
| - catch { file delete $file }
|
| + catch { delete_file $file }
|
| sqlite3 db $file
|
| sqlite3 db3 $file
|
| do_test backup-5.$iTest.5.1 {
|
| @@ -644,8 +644,8 @@ foreach {writer file} {db test.db db3 test.db db :memory:} {
|
| # Test the sqlite3_backup_remaining() and backup_pagecount() APIs.
|
| #
|
| do_test backup-6.1 {
|
| - catch { file delete -force test.db }
|
| - catch { file delete -force test2.db }
|
| + catch { forcedelete test.db }
|
| + catch { forcedelete test2.db }
|
| sqlite3 db test.db
|
| sqlite3 db2 test2.db
|
| execsql {
|
| @@ -701,8 +701,8 @@ catch {db2 close}
|
| # backup-7.3.*: Destination database is externally locked (return SQLITE_BUSY).
|
| #
|
| do_test backup-7.0 {
|
| - catch { file delete -force test.db }
|
| - catch { file delete -force test2.db }
|
| + catch { forcedelete test.db }
|
| + catch { forcedelete test2.db }
|
| sqlite3 db2 test2.db
|
| sqlite3 db test.db
|
| execsql {
|
| @@ -754,7 +754,7 @@ integrity_check backup-7.3.6 db2
|
| do_test backup-7.3.1 {
|
| db2 close
|
| db3 close
|
| - file delete -force test2.db
|
| + forcedelete test2.db
|
| sqlite3 db2 test2.db
|
| sqlite3 db3 test2.db
|
|
|
| @@ -783,8 +783,8 @@ catch { db3 close }
|
| # These tests reuse the database "test.db" left over from backup-7.*.
|
| #
|
| do_test backup-8.1 {
|
| - catch { file delete -force test2.db }
|
| - catch { file delete -force test3.db }
|
| + catch { forcedelete test2.db }
|
| + catch { forcedelete test3.db }
|
| sqlite3 db2 test2.db
|
| sqlite3 db3 test3.db
|
|
|
| @@ -865,8 +865,8 @@ catch {db2 close}
|
|
|
| ifcapable memorymanage {
|
| db close
|
| - file delete -force test.db
|
| - file delete -force bak.db
|
| + forcedelete test.db
|
| + forcedelete bak.db
|
|
|
| sqlite3 db test.db
|
| sqlite3 db2 test.db
|
| @@ -918,7 +918,7 @@ ifcapable memorymanage {
|
| # 10.2.*: If the db is a file, the backup is not restarted.
|
| #
|
| db close
|
| -file delete -force test.db test.db-journal
|
| +forcedelete test.db test.db-journal
|
| foreach {tn file rc} {
|
| 1 test.db SQLITE_DONE
|
| 2 :memory: SQLITE_OK
|
| @@ -948,7 +948,7 @@ foreach {tn file rc} {
|
| } {1}
|
|
|
| do_test backup-10.$tn.3 {
|
| - file delete -force bak.db bak.db-journal
|
| + forcedelete bak.db bak.db-journal
|
| sqlite3 db2 bak.db
|
| sqlite3_backup B db2 main db main
|
| B step 50
|
|
|