From 4f69540b7168fc0d83e6191ae8e6c42d3c3d1946 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 25 Mar 2016 20:10:20 +0000 Subject: [PATCH] Do not run the shell3.test module under mingw because of mingw's dodgy command-line parsing. FossilOrigin-Name: a7c080a90a236fbc18b9a42b78dbed4dd8a25160 --- manifest | 14 +++++++------- manifest.uuid | 2 +- test/shell3.test | 7 +++++++ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index 8558fe1c18..b02404a99f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C In\sthe\sWin32\sVFS,\savoid\strying\sto\suse\srand_s()\son\sWindows\sCE. -D 2016-03-25T17:19:57.501 +C Do\snot\srun\sthe\sshell3.test\smodule\sunder\smingw\sbecause\sof\smingw's\sdodgy\ncommand-line\sparsing. +D 2016-03-25T20:10:20.882 F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66 @@ -1030,7 +1030,7 @@ F test/shared_err.test 2f2aee20db294b9924e81f6ccbe60f19e21e8506 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304 F test/shell1.test 12d1774936facc17a889e0c31877670ef5526f8c F test/shell2.test 2e7a32c9ee03c6398478637d72416d5b9ebd9777 -F test/shell3.test c39453d3012a39ffec944566eca8a6bda10a2284 +F test/shell3.test 1448cb715b8b5f139d96e0e4d3e94ae31fd0a713 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 93caabb66082f76ef161a51ac822b919517a7171 -R 5aa2c9bfd4173374520b94533760d2da -U mistachkin -Z 700a9aa1ab3cd081c3674af5a63a2d5f +P 183350fa7cc6a5ab8bd0a86cab231a6e4c915890 +R 9c42844e710d61bbe7fe13708d65edbf +U drh +Z ea11cf0717b5526a95e62f1683bac7ce diff --git a/manifest.uuid b/manifest.uuid index f363c251a7..7dafaa5910 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -183350fa7cc6a5ab8bd0a86cab231a6e4c915890 \ No newline at end of file +a7c080a90a236fbc18b9a42b78dbed4dd8a25160 \ No newline at end of file diff --git a/test/shell3.test b/test/shell3.test index 3ded8f5ccd..08d31f24eb 100644 --- a/test/shell3.test +++ b/test/shell3.test @@ -26,6 +26,13 @@ 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" + finish_test + return +} + #---------------------------------------------------------------------------- # shell3-1.*: Basic tests for running SQL statments from command line. #