Fix minor problems in the test scripts and harness. (CVS 5394)

FossilOrigin-Name: c9ffbfe343b640051161301869698dd9f1f76cb7

diff --git a/manifest b/manifest
index a17a6658ad8ba169bf914325480c1b777765bf23..8ee480c9c243ddd192cb1b9ce66a9114f0a27a30 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\san\sextra\szeroPage()\scall\sthat\swas\sleft\sin\sthe\sprevious\scheck-in\nby\smistake.\s\sTicket\s#3209.\s(CVS\s5393)
-D 2008-07-11T03:38:41
+C Fix\sminor\sproblems\sin\sthe\stest\sscripts\sand\sharness.\s(CVS\s5394)
+D 2008-07-11T13:53:55
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -157,7 +157,7 @@ F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
 F src/test6.c 0a0304a69cfa4962a429d084c6d451ff9e4fb572
 F src/test7.c 19474b1802858cd2017493c907f70ac2d57ab092
 F src/test8.c 3b85c05b15ccfc6844093791e83d5c8a1e0354ca
-F src/test9.c 4615ef08750245a2d96aaa7cbe2fb4aff2b57acc
+F src/test9.c 904ebe0ed1472d6bad17a81e2ecbfc20017dc237
 F src/test_async.c da9f58f49faccd3a26ba89f58de125862351b6e2
 F src/test_autoext.c f53b0cdf7bf5f08100009572a5d65cdb540bd0ad
 F src/test_btree.c fd982a4242449a462f5a87f120d6e8fcc5e24a83
@@ -415,10 +415,10 @@ F test/misc3.test 7212ed8dad01427e9acab9bd3e7e5e2c2e89be9e
 F test/misc4.test 91e8ed25c092c2bb4e0bb01864631e2930f8d7de
 F test/misc5.test 0b68dcb630d44af2dbcdca94dd2b17c8d580f6fa
 F test/misc6.test 953cc693924d88e6117aeba16f46f0bf5abede91
-F test/misc7.test 68198e6a699f0e8e8e7641d597a9e77c87c961d6
+F test/misc7.test b0d80b95dc2b46ce417cf3e06bfff18166e55181
 F test/misuse.test 30b3a458e5a70c31e74c291937b6c82204c59f33
 F test/mutex1.test b0017a45203e92ddab9e27cc3d6bd5c8637925ac
-F test/mutex2.test 64a627f58c95bce467f4bce41e788b64268e3309
+F test/mutex2.test dce072fe922afaf193de0069ac570d3f15fa011b
 F test/nan.test 14c41572ff52dbc740b1c3303dd313a90dc6084c
 F test/notnull.test 44d600f916b770def8b095a9962dbe3be5a70d82
 F test/null.test a8b09b8ed87852742343b33441a9240022108993
@@ -603,7 +603,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 30825f74d60d8ace39bafd06814017ceefeb4fa4
-R e8411a89d1b019b025b129e9d614b344
+P c45d578e4475486dc5df1c1c0b6987d1cef39188
+R fcf7cc9c66cbbb6fac0990a081db5c0e
 U drh
-Z 67e90b654d2140b470f7c2bf276a171a
+Z a83f4b571a6e380574d50c852424d70b

diff --git a/manifest.uuid b/manifest.uuid
index 4a294f42d23c334d1f1efb137a4cbea33b8ae288..ef930fc21f5c19152a323956e09c95a6fc112e0a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c45d578e4475486dc5df1c1c0b6987d1cef39188
\ No newline at end of file
+c9ffbfe343b640051161301869698dd9f1f76cb7
\ No newline at end of file

diff --git a/src/test9.c b/src/test9.c
index a1fb49beb47f346c99b37be8efde421c62db3084..2043da23f059e6e2d5c964940412357702032440 100644 (file)
--- a/src/test9.c
+++ b/src/test9.c
@@ -14,7 +14,7 @@
 ** for completeness. Test code is written in C for these cases
 ** as there is not much point in binding to Tcl.
 **
-** $Id: test9.c,v 1.5 2008/01/23 12:52:41 drh Exp $
+** $Id: test9.c,v 1.6 2008/07/11 13:53:55 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -47,7 +47,7 @@ static int c_collation_test(
   }
 
   rc = sqlite3_create_collation(db, "collate", 456, 0, 0);
-  if( rc!=SQLITE_ERROR ){
+  if( rc!=SQLITE_MISUSE ){
     sqlite3_close(db);
     zErrFunction = "sqlite3_create_collation";
     goto error_out;

diff --git a/test/misc7.test b/test/misc7.test
index 32841df25a5d6b189ac02a5f9a04d311771d74f0..f3418acd8050edcb4432b35a1b4719879a512d38 100644 (file)
--- a/test/misc7.test
+++ b/test/misc7.test
@@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: misc7.test,v 1.20 2008/07/09 16:51:52 drh Exp $
+# $Id: misc7.test,v 1.21 2008/07/11 13:53:55 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -437,9 +437,9 @@ do_test misc7-18.1 {
       col_1, col_2, col_3, col_4, col_5,
       col_6, col_7, col_8, col_9, col_10
     );
-    SELECT col_10
+    SELECT a.col_10
     FROM
-      (SELECT table_1.col_10 AS col_10 FROM table_1),
+      (SELECT table_1.col_10 AS col_10 FROM table_1) a,
       (SELECT table_1.col_10, table_2.col_9 AS qcol_9
          FROM table_1, table_2
         GROUP BY table_1.col_10, qcol_9);

diff --git a/test/mutex2.test b/test/mutex2.test
index 9fdde2d97d922440b94b0a298037c890616c8e05..aa8f4d5e617cadee90ea1ff17ab79b53df2a47b4 100644 (file)
--- a/test/mutex2.test
+++ b/test/mutex2.test
@@ -11,7 +11,7 @@
 #
 # Test scripts for deliberate failures of mutex routines.
 #
-# $Id: mutex2.test,v 1.4 2008/07/10 18:13:43 drh Exp $
+# $Id: mutex2.test,v 1.5 2008/07/11 13:53:55 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -68,10 +68,10 @@ do_test mutex2-2.6 {
 } {}
 do_test mutex2-2.7 {
   sqlite3_malloc 10000
-} {00000000}
+} {0}
 do_test mutex2-2.8 {
   sqlite3_realloc 0 10000
-} {00000000}
+} {0}
 do_test mutex2-2.9 {
   alloc_dealloc_mutex
 } {0}