Fix test cases due to recent CLI default prompt changes. Make sure ANSI

escape codes are recognized on Windows terminals.

FossilOrigin-Name: 22b791e404f0895b0f343b2ce0e169a7ada8578e46a39a9f4bd3a31f81c9853c

diff --git a/manifest b/manifest
index 1d6e76e42f7d8f1c76659e1fbc929c46b1712542..d5c56fd67a454e4a504f35bade227fed22ade621 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improvements\sto\sthe\sdefault\sprompt\sfor\sthe\sCLI.
-D 2026-04-24T09:21:25.370
+C Fix\stest\scases\sdue\sto\srecent\sCLI\sdefault\sprompt\schanges.\s\sMake\ssure\sANSI\nescape\scodes\sare\srecognized\son\sWindows\sterminals.
+D 2026-04-24T20:27:42.012
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -736,7 +736,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49
-F src/shell.c.in 9dfaba6c374b5b08356f8579d23577217e516cb62b7e52d5264cf4fd52a0d98c
+F src/shell.c.in 8fd0b427126284c922895cb664bbc02c1eca0b0530c726ef03f61a87b605d2c6
 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -1624,7 +1624,7 @@ F test/sharedA.test 64bdd21216dda2c6a3bd3475348ccdc108160f34682c97f2f51c19fc0e21
 F test/sharedB.test 1a84863d7a2204e0d42f2e1606577c5e92e4473fa37ea0f5bdf829e4bf8ee707
 F test/shared_err.test 32634e404a3317eeb94abc7a099c556a346fdb8fb3858dbe222a4cbb8926a939
 F test/sharedlock.test 5ede3c37439067c43b0198f580fd374ebf15d304
-F test/shell-prompt.sql 489c77873ac415d998fe890e9df16e91feadf4fb03d91e60987af59630e8452f
+F test/shell-prompt.sql 868ca1711677ada45720532fe23dbbbe881f3612dc29692dac45b19129648b3f
 F test/shell1.test c84eff209f93ad17ccdf7e1634969fc8231684254edeb21d9b13d67c3179cdb5
 F test/shell2.test dc541d2681503e55466a24d35a4cbf8ca5b90b8fcdef37fc4db07373a67d31d3
 F test/shell3.test 91efdd545097a61a1f72cf79c9ad5b49da080f3f10282eaf4c3c272cd1012db2
@@ -2203,8 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 78193b60346dba304485241dd65f0eb6e971714397b76191b3bf7a5fdb44916b
-R b9fe0b21dca421584f3c06a1d8296d98
+P 9ab0bb487f78ba5a51cd3b4efcee23b11096e90ebf3add4da18aea657e8de0b6
+R 1ee7f0f01a210bd28df579df4aa17424
 U drh
-Z 7e06ca946aa159d9a10ad8a4a007217a
+Z 0c63beb0997dcd285efe96d8e49b849c
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 268a2ba51d9eb9faca7c9520648855da98f30607..acaf147d40e67da39f744b9d6f67714279e783d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ab0bb487f78ba5a51cd3b4efcee23b11096e90ebf3add4da18aea657e8de0b6
+22b791e404f0895b0f343b2ce0e169a7ada8578e46a39a9f4bd3a31f81c9853c

diff --git a/src/shell.c.in b/src/shell.c.in
index d1991f31ef80a4576824cf086d4f4b69f1963128..2a02a8942bedf365b6f059c08988848be4b4c366 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -13306,6 +13306,8 @@ static int auto_ext_leak_tester(
 int SQLITE_CDECL utf8_main(int,char**);  /* Forward declaration */  
 int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
   int rc, i;
+  DWORD mode;
+  HANDLE hOut;
   char **argv = malloc( sizeof(char*) * (argc+1) );
   char **orig = argv;
   if( argv==0 ){
@@ -13330,6 +13332,9 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
     }
   }
   argv[argc] = 0;
+  hOut = GetStdHandle(STD_OUTPUT_HANDLE);
+  GetConsoleMode(hOut, &mode);
+  SetConsoleMode(hOut, mode | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
   rc = utf8_main(argc, argv);
   for(i=0; i<argc; i++) free(orig[i]);
   free(argv);

diff --git a/test/shell-prompt.sql b/test/shell-prompt.sql
index f3009eec31c6247d76f6ac7a1a8065d3314736c7..120d490377d5bd62afd5ad6216fd86da5325653a 100644 (file)
--- a/test/shell-prompt.sql
+++ b/test/shell-prompt.sql
@@ -29,8 +29,8 @@
 .testcase 110
 .prompt --show
 .check --glob <<END
-Main prompt:  '*/A*/~>*'
-Continuation: '/B*/C>*'
+Main prompt:  '*/A*/f*-> '
+Continuation: '/B*/C*-> '
 END
 .testcase 111
 .prompt 'abc> ' '123> ' -show
@@ -48,8 +48,8 @@ END
 .testcase 113
 .prompt --reset --show
 .check --glob <<END
-Main prompt:  '*/A*/~>*'
-Continuation: '/B*/C>*'
+Main prompt:  '*/A*/f*> '
+Continuation: '/B*/C*> '
 END
 
 .testcase 120 --error-prefix ERROR:
@@ -66,7 +66,7 @@ END
 .prompt --show
 .check --glob <<END
 Main prompt:  'show'
-Continuation: '/B*/C>*'
+Continuation: '/B*/C*> '
 END
 
 .testcase 130
@@ -90,31 +90,31 @@ END
 
 .testcase 1000
 SELECT shell_prompt_test(NULL);
-.check --glob '*SQLite-3*test.db>*';
+.check --glob '*SQLite-3*test.db*-> ';
 .testcase 1001
 SELECT shell_prompt_test(NULL,'SELECT');
-.check --glob ' *;>*';
+.check --glob ' *;*-> ';
 .testcase 1002
 SELECT shell_prompt_test(NULL,'SELECT ((("');
-.check --glob ' *[ m]")));>*';
+.check --glob ' *[ m]")));*-> ';
 .testcase 1003
 SELECT shell_prompt_test(NULL,'SELECT ((()[');
-.check --glob ' *[ m]]));>*';
+.check --glob ' *[ m]]));*-> ';
 .testcase 1004
 SELECT shell_prompt_test(NULL,'SELECT ''');
-.check --glob " *[ m]';>*";
+.check --glob " *[ m]';*-> ";
 .testcase 1005
 SELECT shell_prompt_test(NULL,'CREATE TRIGGER t1 BEGIN');
-.check --glob " *[ m];END;>*";
+.check --glob " *[ m];END;*-> ";
 .testcase 1006
 SELECT shell_prompt_test(NULL,'CREATE TRIGGER t1 BEGIN SELECT ((([');
-.check --glob " *[ m]])));END;>*";
+.check --glob " *[ m]])));END;*-> ";
 .testcase 1007
 SELECT shell_prompt_test(NULL,'CREATE TRIGGER t1 BEGIN SELECT ((/*a(((''bc');
-.check --glob " *[ m][*]/));END;>*";
+.check --glob " *[ m][*]/));END;*-> ";
 .testcase 1008
 SELECT shell_prompt_test(NULL,'CREATE TRIGGER t1 BEGIN SELECT 1;');
-.check --glob " *[ m]END;>*";
+.check --glob " *[ m]END;*-> ";
 
 .testcase 2000
 .prompt 'SQLite/x-txn$/:>/; '
@@ -135,7 +135,7 @@ SELECT shell_prompt_test(NULL);
 .testcase 2004
 .prompt --reset
 SELECT shell_prompt_test(NULL);
-.check --glob '*SQLite-3.# *[/\]test.db>*';
+.check --glob '*SQLite-3.# *test.db*-> ';
 
 .testcase 3000
 SELECT shell_prompt_test('(/A-/V)');