Index: third_party/sqlite/sqlite-src-3080704/test/shell3.test |
diff --git a/third_party/sqlite/src/tool/shell3.test b/third_party/sqlite/sqlite-src-3080704/test/shell3.test |
similarity index 74% |
copy from third_party/sqlite/src/tool/shell3.test |
copy to third_party/sqlite/sqlite-src-3080704/test/shell3.test |
index d37adff2d31742f26d85c5e29da798dfcfde3249..ce1fd4ecb5d82931fc0dddf5abaa1f2b63a71885 100644 |
--- a/third_party/sqlite/src/tool/shell3.test |
+++ b/third_party/sqlite/sqlite-src-3080704/test/shell3.test |
@@ -19,54 +19,28 @@ |
# shell3-1.*: Basic tests for running SQL statments from command line. |
# shell3-2.*: Basic tests for running SQL file from command line. |
# |
- |
-package require sqlite3 |
- |
-set CLI "./sqlite3" |
- |
-proc do_test {name cmd expected} { |
- puts -nonewline "$name ..." |
- set res [uplevel $cmd] |
- if {$res eq $expected} { |
- puts Ok |
- } else { |
- puts Error |
- puts " Got: $res" |
- puts " Expected: $expected" |
- exit |
- } |
+set testdir [file dirname $argv0] |
+source $testdir/tester.tcl |
+if {$tcl_platform(platform)=="windows"} { |
+ set CLI "sqlite3.exe" |
+} else { |
+ set CLI "./sqlite3" |
} |
- |
-proc execsql {sql} { |
- uplevel [list db eval $sql] |
-} |
- |
-proc catchsql {sql} { |
- set rc [catch {uplevel [list db eval $sql]} msg] |
- list $rc $msg |
+if {![file executable $CLI]} { |
+ finish_test |
+ return |
} |
- |
-proc catchcmd {db {cmd ""}} { |
- global CLI |
- set out [open cmds.txt w] |
- puts $out $cmd |
- close $out |
- set line "exec $CLI $db < cmds.txt" |
- set rc [catch { eval $line } msg] |
- list $rc $msg |
-} |
- |
-file delete -force test.db test.db.journal |
+db close |
+forcedelete test.db test.db-journal test.db-wal |
sqlite3 db test.db |
- |
#---------------------------------------------------------------------------- |
# shell3-1.*: Basic tests for running SQL statments from command line. |
# |
# Run SQL statement from command line |
do_test shell3-1.1 { |
- file delete -force foo.db |
+ forcedelete foo.db |
set rc [ catchcmd "foo.db \"CREATE TABLE t1(a);\"" ] |
set fexist [file exist foo.db] |
list $rc $fexist |
@@ -96,7 +70,7 @@ do_test shell3-1.7 { |
# Run SQL file from command line |
do_test shell3-2.1 { |
- file delete -force foo.db |
+ forcedelete foo.db |
set rc [ catchcmd "foo.db" "CREATE TABLE t1(a);" ] |
set fexist [file exist foo.db] |
list $rc $fexist |
@@ -120,5 +94,4 @@ do_test shell3-2.7 { |
catchcmd "foo.db" "CREATE TABLE" |
} {1 {Error: incomplete SQL: CREATE TABLE}} |
- |
-puts "CLI tests completed successfully" |
+finish_test |