/ Check-in [8213c2f5]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:More changes to the shellN.test scripts to get them working on all variations of Windows.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 8213c2f58167243411d29cc58e303b4be656f756
User & Date: drh 2016-03-26 15:36:36
Context
2016-03-28
11:01
Fix the multiplexor so that it does not assume that the xGetLastError method is non-NULL in the child VFS. check-in: f6a88ccc user: drh tags: trunk
2016-03-26
20:11
Fix a problem with OOM handling when setting an fts5 configuration option. check-in: 53b80a6d user: dan tags: fts5
15:36
More changes to the shellN.test scripts to get them working on all variations of Windows. check-in: 8213c2f5 user: drh tags: trunk
14:41
Remove the catchcmd_collapse_space procedure in tester.tcl - no longer needed. check-in: 3bd499d3 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to test/shell1.test.

    41     41     set res [catchcmd "test.db -bad" ""]
    42     42     set rc [lindex $res 0]
    43     43     list $rc \
    44     44          [regexp {Error: unknown option: -bad} $res]
    45     45   } {1 1}
    46     46   # error on extra options
    47     47   do_test shell1-1.1.2 {
    48         -  catchcmd "test.db \"select 3\" \"select 4\"" ""
           48  +  catchcmd "test.db \"select+3\" \"select+4\"" ""
    49     49   } {0 {3
    50     50   4}}
    51     51   # error on extra options
    52     52   do_test shell1-1.1.3 {
    53     53     catchcmd "test.db FOO test.db BAD" ".quit"
    54     54   } {1 {Error: near "FOO": syntax error}}
    55     55   

Changes to test/shell2.test.

    39     39     set fexist [file exist foo.db]
    40     40     list $rc $fexist
    41     41   } {{0 {}} 1}
    42     42   
    43     43   # Shell silently ignores extra parameters.
    44     44   # Ticket [f5cb008a65].
    45     45   do_test shell2-1.2.1 {
    46         -  set rc [catch { eval exec $CLI \":memory:\" \"select 3\" \"select 4\" } msg]
           46  +  set rc [catch { eval exec $CLI \":memory:\" \"select+3\" \"select+4\" } msg]
    47     47     list $rc $msg
    48     48   } {0 {3
    49     49   4}}
    50     50   
    51     51   # Test a problem reported on the mailing list. The shell was at one point
    52     52   # returning the generic SQLITE_ERROR message ("SQL error or missing database")
    53     53   # instead of the "too many levels..." message in the test below.

Changes to test/shell3.test.

    22     22   set testdir [file dirname $argv0]
    23     23   source $testdir/tester.tcl
    24     24   set CLI [test_find_cli]
    25     25   db close
    26     26   forcedelete test.db test.db-journal test.db-wal
    27     27   sqlite3 db test.db
    28     28   
    29         -if {[info exists env(MSYSCON)] && $env(MSYSCON)=="sh.exe"} {
    30         -  puts "shell3 tests do not work with the mingw shell due to dodgy\
    31         -        command-line parsing"
           29  +# There are inconsistencies in command-line argument quoting on Windows.
           30  +# In particular, individual applications are responsible for command-line
           31  +# parsing in Windows, not the shell.  Depending on whether the sqlite3.exe
           32  +# program is compiled with MinGW or MSVC, the command-line parsing is
           33  +# different.  This causes problems for the tests below.  To avoid
           34  +# issues, these tests are disabled for windows.
           35  +#
           36  +if {$::tcl_platform(platform)=="windows"} {
    32     37     finish_test
    33     38     return
    34     39   }
    35     40   
    36     41   #----------------------------------------------------------------------------
    37     42   #   shell3-1.*: Basic tests for running SQL statments from command line.
    38     43   #