Move the shell test scripts into the test/ subfolder so that they are

run automatically by "make test".

FossilOrigin-Name: 9fb7da6904e479f4671eeebf1a4b7e4e4e4f2b7b

diff --git a/manifest b/manifest
index fa3712737ad1caa0b3b7d6f019c5c90d992e8424..1e7684a508f7d5751d7c594e594eee17ec07efa1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\ssign-extension\sproblem\sfor\sBLOB\soutput\sin\s".insert"\smode\sof\sthe\ncommand-line\sshell.
-D 2012-04-24T12:12:57.348
+C Move\sthe\sshell\stest\sscripts\sinto\sthe\stest/\ssubfolder\sso\sthat\sthey\sare\nrun\sautomatically\sby\s"make\stest".
+D 2012-04-24T12:46:05.097
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -689,6 +689,11 @@ F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
 F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
 F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
 F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
+F test/shell1.test 6d5a331713a7eadde26802b6be7f6330a1064319 w tool/shell1.test
+F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a w tool/shell2.test
+F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59 w tool/shell3.test
+F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9 w tool/shell4.test
+F test/shell5.test fa2188bbb13fe2d183fd04a5f7b512650c35ef5d w tool/shell5.test
 F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
 F test/shrink.test 8c70f62b6e8eb4d54533de6d65bd06b1b9a17868
 F test/sidedelete.test f0ad71abe6233e3b153100f3b8d679b19a488329
@@ -720,7 +725,7 @@ F test/tclsqlite.test 1597d353308531527583481d14d9da52ea8ed0af
 F test/tempdb.test 19d0f66e2e3eeffd68661a11c83ba5e6ace9128c
 F test/temptable.test 51edd31c65ed1560dd600b1796e8325df96318e2
 F test/temptrigger.test 26670ed7a39cf2296a7f0a9e0a1d7bdb7abe936d
-F test/tester.tcl 7db9e90e4a9cc57ea92118ee011634f86dc8e847
+F test/tester.tcl dc0f9daa0a7c257df86a1a7603d5df2236e49145
 F test/thread001.test 7cc2ce08f9cde95964736d11e91f9ab610f82f91
 F test/thread002.test e630504f8a06c00bf8bbe68528774dd96aeb2e58
 F test/thread003.test ee4c9efc3b86a6a2767516a37bd64251272560a7
@@ -972,11 +977,6 @@ F tool/omittest.tcl 72a49b8a9a8b0bf213a438180307a0df836d4380
 F tool/opcodeDoc.awk b3a2a3d5d3075b8bd90b7afe24283efdd586659c
 F tool/restore_jrnl.tcl 6957a34f8f1f0f8285e07536225ec3b292a9024a
 F tool/rollback-test.c 9fc98427d1e23e84429d7e6d07d9094fbdec65a5
-F tool/shell1.test 20dfe7099cf2afe37aecd69afb7678d14f7a0abf
-F tool/shell2.test 5dc76b8005b465f420fed8241621da7513060ff3
-F tool/shell3.test 4fad469e8003938426355afdf34155f08c587836
-F tool/shell4.test 35f9c3d452b4e76d5013c63e1fd07478a62f14ce
-F tool/shell5.test 0e987fb8d40638bb5c90163cb58cbe3e07dbed56
 F tool/showdb.c 2e28d8e499b016485672e9a7ac65dacc0d28ff69
 F tool/showjournal.c b62cecaab86a4053d944c276bb5232e4d17ece02
 F tool/showwal.c f09e5a80a293919290ec85a6a37c85a5ddcf37d9
@@ -995,7 +995,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P ce2d06e2533763a8008e7a405630293d8f9a3108
-R 3cb8ce97e629e462f046b05d1b3f651d
+P 282f2a74c23aa3fca6087bdeaf5d961b4f5bbe47
+R fb1a373c8aab089fc987aaa3b3a46480
 U drh
-Z 1d5f5dcc20d86aab9e41b01973a0dba1
+Z d17213a51e75d7b6538576f270927349

diff --git a/manifest.uuid b/manifest.uuid
index 3baf8a3fc64e4c3f173a0e65781f535e4e426d4d..4c160508c75e503d8c7dfd5e1cd6563ecbb4128c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-282f2a74c23aa3fca6087bdeaf5d961b4f5bbe47
\ No newline at end of file
+9fb7da6904e479f4671eeebf1a4b7e4e4e4f2b7b
\ No newline at end of file

diff --git a/tool/shell1.test b/test/shell1.test
similarity index 96%
rename from tool/shell1.test
rename to test/shell1.test
index 9dd9df55554277023094693482faea36a4cc36a8..473d5a38458ba95ad3ee443286b19bcc2a47ed52 100644 (file)
--- a/tool/shell1.test
+++ b/test/shell1.test
@@ -11,7 +11,6 @@
 #
 # The focus of this file is testing the CLI shell tool.
 #
-# $Id: shell1.test,v 1.7 2009/07/17 16:54:48 shaneh Exp $
 #
 
 # Test plan:
@@ -20,44 +19,19 @@
 #   shell1-2.*: Basic "dot" command token parsing.
 #   shell1-3.*: Basic test that "dot" command can be called.
 #
-
-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
-  }
-}
-
-proc execsql {sql} {
-  uplevel [list db eval $sql]
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+if {$tcl_platform(platform)=="windows"} {
+  set CLI "sqlite3.exe"
+} else {
+  set CLI "./sqlite3"
 }
-
-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
 
 #----------------------------------------------------------------------------
@@ -717,4 +691,4 @@ do_test shell1-3-28.1 {
      ".log stdout\nSELECT coalesce(sqlite_log(123,'hello'),'456');"
 } "0 {(123) hello\n456}"
 
-puts "CLI tests completed successfully"
+finish_test

diff --git a/tool/shell2.test b/test/shell2.test
similarity index 86%
rename from tool/shell2.test
rename to test/shell2.test
index b63fafc3656e666e62566527332f142aa92721d9..826093262e9e15ad5e8257de5b38d7b32f44554a 100644 (file)
--- a/tool/shell2.test
+++ b/test/shell2.test
@@ -18,44 +18,19 @@
 #
 #   shell2-1.*: Misc. test of various tickets and reported errors.
 #
-
-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
-  }
-}
-
-proc execsql {sql} {
-  uplevel [list db eval $sql]
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+if {$tcl_platform(platform)=="windows"} {
+  set CLI "sqlite3.exe"
+} else {
+  set CLI "./sqlite3"
 }
-
-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
 
 
@@ -219,4 +194,4 @@ b
 1
 2}}
 
-puts "CLI tests completed successfully"
+finish_test

diff --git a/tool/shell3.test b/test/shell3.test
similarity index 76%
rename from tool/shell3.test
rename to test/shell3.test
index d37adff2d31742f26d85c5e29da798dfcfde3249..d02177b7f6582d0d6450118f17212855af7c1185 100644 (file)
--- a/tool/shell3.test
+++ b/test/shell3.test
@@ -19,47 +19,21 @@
 #   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.
 #
@@ -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

diff --git a/tool/shell4.test b/test/shell4.test
similarity index 83%
rename from tool/shell4.test
rename to test/shell4.test
index 085c279bb3148dc4ccda9a1c392613b78fc27e0d..5af44c8fd7cb05d160bfef7c01771473d43bb9e7 100644 (file)
--- a/tool/shell4.test
+++ b/test/shell4.test
@@ -19,33 +19,20 @@
 #
 #   shell4-1.*: Basic tests specific to the "stats" command.
 #
-
-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 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
+if {![file executable $CLI]} {
+  finish_test
+  return
 }
-
-file delete -force test.db test.db.journal
+db close
+forcedelete test.db test.db-journal test.db-wal
+sqlite3 db test.db
 
 #----------------------------------------------------------------------------
 # Test cases shell4-1.*: Tests specific to the "stats" command.
@@ -126,4 +113,4 @@ SELECT 1;
        [regexp {Autoindex Inserts} $res]
 } {1 1 1}
 
-puts "CLI tests completed successfully"
+finish_test

diff --git a/tool/shell5.test b/test/shell5.test
similarity index 92%
rename from tool/shell5.test
rename to test/shell5.test
index 828d71c97a92e3a9e2a21c27205af973e53bee33..d90cedf949ef834d9b41cf19c453c164925dd8dd 100644 (file)
--- a/tool/shell5.test
+++ b/test/shell5.test
@@ -19,33 +19,20 @@
 #
 #   shell5-1.*: Basic tests specific to the ".import" command.
 #
-
-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 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
+if {![file executable $CLI]} {
+  finish_test
+  return
 }
-
-file delete -force test.db test.db.journal
+db close
+forcedelete test.db test.db-journal test.db-wal
+sqlite3 db test.db
 
 #----------------------------------------------------------------------------
 # Test cases shell5-1.*: Basic handling of the .import and .separator commands.
@@ -239,5 +226,4 @@ do_test shell5-1.7.1 {
 SELECT COUNT(*) FROM t3;}]
 } [list 0 $rows]
 
-
-puts "CLI tests completed successfully"
+finish_test

diff --git a/test/tester.tcl b/test/tester.tcl
index 5bc7eb704da75819240c2982f04d2f0f47bc8472..d1c4f0bd6ced825367c2c88dd95f9903851f59a5 100644 (file)
--- a/test/tester.tcl
+++ b/test/tester.tcl
@@ -518,6 +518,16 @@ proc do_test {name cmd expected} {
   flush stdout
 }
 
+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
+}
+
 proc filepath_normalize {p} {
   # test cases should be written to assume "unix"-like file paths
   if {$::tcl_platform(platform)!="unix"} {