More changes to the shellN.test scripts to get them working on all variations

of Windows.

FossilOrigin-Name: 8213c2f58167243411d29cc58e303b4be656f756
This commit is contained in:
drh 2016-03-26 15:36:36 +00:00
parent eaa544d44d
commit 60c4249fcc
5 changed files with 19 additions and 14 deletions

View File

@ -1,5 +1,5 @@
C Remove\sthe\scatchcmd_collapse_space\sprocedure\sin\stester.tcl\s-\sno\slonger\sneeded.
D 2016-03-26T14:41:13.450
C More\schanges\sto\sthe\sshellN.test\sscripts\sto\sget\sthem\sworking\son\sall\svariations\nof\sWindows.
D 2016-03-26T15:36:36.768
F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@ -1028,9 +1028,9 @@ F test/sharedA.test 0cdf1a76dfa00e6beee66af5b534b1e8df2720f5
F test/sharedB.test 16cc7178e20965d75278f410943109b77b2e645e
F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506
F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
F test/shell1.test d36a68f0d560b7f50177845e409910ed855b1a27
F test/shell2.test 2e7a32c9ee03c6398478637d72416d5b9ebd9777
F test/shell3.test 1448cb715b8b5f139d96e0e4d3e94ae31fd0a713
F test/shell1.test dff5b20ad989770aface6d714491121172dfe8b0
F test/shell2.test e242a9912f44f4c23c3d1d802a83e934e84c853b
F test/shell3.test da513d522ef6f01cee8475dcf8332bff8982b3dd
F test/shell4.test 69995ee1cc278eb149aa8746ce1f935f4eaf98b9
F test/shell5.test 50a732c1c2158b1cd62cf53975ce1ea7ce6b9dc9
F test/shortread1.test bb591ef20f0fd9ed26d0d12e80eee6d7ac8897a3
@ -1459,7 +1459,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 219a251e182bf43376fbc8ae1ce6f77f18a1b092
R c56b0aa6959f9b74a14b039c91d81909
P 3bd499d3bdf4e80f83513966c2ee9dd11e67cbd1
R 0f980ceb534899c3d74e7aadbdc990e8
U drh
Z 93b7eb233dfe81212bc718ee014c61a9
Z 6df6f858842cee4837ac5cccff369bba

View File

@ -1 +1 @@
3bd499d3bdf4e80f83513966c2ee9dd11e67cbd1
8213c2f58167243411d29cc58e303b4be656f756

View File

@ -45,7 +45,7 @@ do_test shell1-1.1.1b {
} {1 1}
# error on extra options
do_test shell1-1.1.2 {
catchcmd "test.db \"select 3\" \"select 4\"" ""
catchcmd "test.db \"select+3\" \"select+4\"" ""
} {0 {3
4}}
# error on extra options

View File

@ -43,7 +43,7 @@ do_test shell2-1.1.1 {
# Shell silently ignores extra parameters.
# Ticket [f5cb008a65].
do_test shell2-1.2.1 {
set rc [catch { eval exec $CLI \":memory:\" \"select 3\" \"select 4\" } msg]
set rc [catch { eval exec $CLI \":memory:\" \"select+3\" \"select+4\" } msg]
list $rc $msg
} {0 {3
4}}

View File

@ -26,9 +26,14 @@ db close
forcedelete test.db test.db-journal test.db-wal
sqlite3 db test.db
if {[info exists env(MSYSCON)] && $env(MSYSCON)=="sh.exe"} {
puts "shell3 tests do not work with the mingw shell due to dodgy\
command-line parsing"
# There are inconsistencies in command-line argument quoting on Windows.
# In particular, individual applications are responsible for command-line
# parsing in Windows, not the shell. Depending on whether the sqlite3.exe
# program is compiled with MinGW or MSVC, the command-line parsing is
# different. This causes problems for the tests below. To avoid
# issues, these tests are disabled for windows.
#
if {$::tcl_platform(platform)=="windows"} {
finish_test
return
}