Fix the ".check" command of the command-line shell to return 1 (error)

rather than 2 (exit) on a test failure.

FossilOrigin-Name: e2af0cc6ef5fafc785b8b73f51995901f50822972dcfb632494e22402596186d

diff --git a/manifest b/manifest
index ab44e57d39c86649e8e8efbc46d2713c6b4725ac..de1b01a07e5eef2595a4906582e168a653f9d5f7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments,\sincluding\sa\stypo\sfix,\son\sthe\swhereLoopCheaperProperSubset()\nfunction.
-D 2017-10-16T11:50:12.951
+C Fix\sthe\s".check"\scommand\sof\sthe\scommand-line\sshell\sto\sreturn\s1\s(error)\nrather\sthan\s2\s(exit)\son\sa\stest\sfailure.
+D 2017-10-17T13:44:46.075
 F Makefile.in e016061b23e60ac9ec27c65cb577292b6bde0307ca55abd874ab3487b3b1beb2
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 37740aba9c4bb359c627eadccf1cfd7be4f5f847078723777ea7763969e533b1
@@ -462,7 +462,7 @@ F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384
 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20
 F src/rowset.c 7b7e7e479212e65b723bf40128c7b36dc5afdfac
 F src/select.c 42aca61e739c405ddd8a1b702977a7743c7d52a94885f7c5596bd7e73e6bff18
-F src/shell.c.in 5446de0a90c15d713bbdb5827cf57ec30d1c3497097f39ec2c2e874dcca34ca3
+F src/shell.c.in f13262c8778f0cd76bf8d9c01bbf5ef66842e6b14e1705cd60d86ab32a6ce69f
 F src/sqlite.h.in ab4f8a29d1580dfaeb6891fa1b83cff8229ba0daa56994707ceaca71495d9ab7
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a1fd3aa82f967da436164e0728a7d6841651fd0c6e27b9044e0eb9f6c8462e47
@@ -1664,7 +1664,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 ee31c04353cd75ea4bbadee2994c30d3808b696a4f680187502d104902988a5d
-R 593b5394fda7f5c3a7e7e5312c0a0c37
+P 700a3c694438ca6cca185d0097f24799e82717ef38cb47bd83666c80f0e3cb2f
+R 7b11fa4b75f3d72b968740b4ad577de5
 U drh
-Z d6213a58e95c0fa7e25d95c2efa3d8ac
+Z eb279a84da6335af377cd536eb14b148

diff --git a/manifest.uuid b/manifest.uuid
index 3281f881f9a8d1bb887ff767103bdc104b4a2ab3..cd80d78996aa8d6ad9a3ea409ab4932d6901962d 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-700a3c694438ca6cca185d0097f24799e82717ef38cb47bd83666c80f0e3cb2f
\ No newline at end of file
+e2af0cc6ef5fafc785b8b73f51995901f50822972dcfb632494e22402596186d
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index b62c05507654114e8efc4a22bb6df294ee6bd990..8f5ed59e9304666a22c1b18d690407db106a2f06 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -4248,7 +4248,7 @@ static int do_meta_command(char *zLine, ShellState *p){
       utf8_printf(stderr,
                  "testcase-%s FAILED\n Expected: [%s]\n      Got: [%s]\n",
                  p->zTestcase, azArg[1], zRes);
-      rc = 2;
+      rc = 1;
     }else{
       utf8_printf(stdout, "testcase-%s ok\n", p->zTestcase);
       p->nCheck++;