Fix a test case in the shell1.test script so that it works even for very

long pathnames.

FossilOrigin-Name: 0c0a03987cc144fa017b0a0f9cf45c36e74fbd9f

diff --git a/manifest b/manifest
index 68138a320dc6b2c246aaf4c74735ffd4134f2707..b2f7df5aded050088984bb65c16ed3d34361e5b4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sassert()s\sto\sverify\sthat\sTable\sobjects\sin\sthe\sschema\snever\suse\nlookaside\smemory.
-D 2012-05-15T12:49:32.294
+C Fix\sa\stest\scase\sin\sthe\sshell1.test\sscript\sso\sthat\sit\sworks\seven\sfor\svery\nlong\spathnames.
+D 2012-05-20T20:14:18.103
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -234,7 +234,7 @@ F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
 F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
 F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
 F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
-F src/vdbe.c e1d26b98288889c22f00cf4851ec351ee67ad8b9
+F src/vdbe.c dfb52b28683d3ae14ae5e7a98f457b904b075766
 F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
 F src/vdbeInt.h 6ff4180a05683566a8835d12f7ec504b22932c82
 F src/vdbeapi.c 3662b6a468a2a4605a15dfab313baa6dff81ad91
@@ -690,7 +690,7 @@ F test/shared6.test 866bb4982c45ce216c61ded5e8fde4e7e2f3ffa9
 F test/shared7.test 960760bc8d03e1419e70dea69cf41db62853616e
 F test/shared_err.test 91e26ec4f3fbe07951967955585137e2f18993de
 F test/sharedlock.test ffa0a3c4ac192145b310f1254f8afca4d553eabf
-F test/shell1.test cd9f846702d1d471225a988fee590a153be8192c
+F test/shell1.test e3228ec90949e4a51797d452983584932a6c6372
 F test/shell2.test 037d6ad16e873354195d30bb2dc4b5321788154a
 F test/shell3.test 9196c42772d575685e722c92b4b39053c6ebba59
 F test/shell4.test aa4eef8118b412d1a01477a53426ece169ea86a9
@@ -997,7 +997,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 0bb1cfc63f982db7b29c8e6be6698a6dad100f70
-R 040b7c6409bc9c8d46165baae8f02a6f
+P 736d6ea677f58e4aa2914fa79a3156b775c5a3f5
+R e296c06ffd3218b116745e7710145c70
 U drh
-Z 46fb04131884f3e5ee0e8870b1bd5af5
+Z f87536fa4498dc9475542d83ab7f8b87

diff --git a/manifest.uuid b/manifest.uuid
index d1f1a9b991f2edb81e95abe9314c392849d00570..139e9650df797f1f065864f02968973573ab4caf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-736d6ea677f58e4aa2914fa79a3156b775c5a3f5
\ No newline at end of file
+0c0a03987cc144fa017b0a0f9cf45c36e74fbd9f
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index fa5180c9a42c801442e612b9aface1c0ffedb98c..b72533ab9368001b3b346f8d82770432a17240b6 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -6204,6 +6204,7 @@ abort_due_to_interrupt:
   assert( db->u1.isInterrupted );
   rc = SQLITE_INTERRUPT;
   p->rc = rc;
+printf("INTERRUPT [%s]\n", p->zSql); fflush(stdout);
   sqlite3SetString(&p->zErrMsg, db, "%s", sqlite3ErrStr(rc));
   goto vdbe_error_halt;
 }

diff --git a/test/shell1.test b/test/shell1.test
index 2a839d5bc67e3876a7e00b60ead1c86f68989430..10c4ff6a643f1763af9fdd615f53dd046b930680 100644 (file)
--- a/test/shell1.test
+++ b/test/shell1.test
@@ -284,7 +284,7 @@ do_test shell1-3.2.4 {
 # .databases             List names and files of attached databases
 do_test shell1-3.3.1 {
   catchcmd "-csv test.db" ".databases"
-} {/0 +.*main +.*test.db.*/}
+} "/0 +.*main +[string map {/ .} [string range [pwd] 0 10]].*/"
 do_test shell1-3.3.2 {
   # too many arguments
   catchcmd "test.db" ".databases BAD"