Fix problem building testfixture on mac. Ticket #2689. (CVS 4470)

FossilOrigin-Name: fe067d706b40d9756433eac9896660514d1c8216

diff --git a/Makefile.in b/Makefile.in
index 5f7d0401054f5df0f8c7f965b16e8ed1939b3a3c..f279f41d4217a0330b680c915fc76306aba51e1c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -245,9 +245,11 @@ TESTSRC = \
   $(TOP)/src/test_hexio.c \
   $(TOP)/src/test_malloc.c \
   $(TOP)/src/test_md5.c \
+  $(TOP)/src/test_onefile.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
   $(TOP)/src/test_tclvar.c \
+  $(TOP)/src/test_thread.c \
   $(TOP)/src/tokenize.c \
   $(TOP)/src/utf.c \
   $(TOP)/src/util.c \

diff --git a/manifest b/manifest
index 44e4d3c973a4b838399cffd2d4d676480d46b474..050232168204e3111276a569ded46772970f9849 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C The\ssqlite3internal.h\sfile\sobsolete\sas\sof\sversion\s3.5.0.\s\sRemove\nlegacy\sprocedures\sand\smakefile\stargets\sfor\sbuilding\sthis\sfile.\nTickets\s#2693\sand\s#2694.\s(CVS\s4469)
-D 2007-10-05T14:54:08
-F Makefile.in cbfb898945536a8f9ea8b897e1586dd1fdbcc5db
+C Fix\sproblem\sbuilding\stestfixture\son\smac.\sTicket\s#2689.\s(CVS\s4470)
+D 2007-10-05T15:04:13
+F Makefile.in 75b729d562e9525d57d9890ec598b38e1a8b02bc
 F Makefile.linux-gcc 65241babba6faf1152bf86574477baab19190499
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
 F VERSION 873b19f713b5e7481dd12648f2fa3178058dee00
@@ -142,7 +142,7 @@ F src/test3.c 73c1fd55d1ece61f295a6b9204fd97a139de86ae
 F src/test4.c c2c0f5dc907f1346f5d4b65eb5799f11eb9e4071
 F src/test5.c 3a6a5717a149d7ca2e6d14f5be72cf7555d54dc4
 F src/test6.c a9fc983d32d6f262eab300d742e49ff239b0bdbd
-F src/test7.c ae24ba989ecc2dc600d93c6311191b5d0c596f2b
+F src/test7.c acec2256c7c2d279db5a8b5fa1a2a68fcc942c67
 F src/test8.c f113aa3723a52113d0fa7c28155ecd37e7e04077
 F src/test9.c b46c8fe02ac7cca1a7316436d8d38d50c66f4b2f
 F src/test_async.c c5ea222c2bb0c3c33ab910d1b82622655dd50684
@@ -581,7 +581,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 38674fd287e0ca67e27c46a3ad0db4dcc8ed1e0c
-R d6fd7079c36c10d2b406996d8e798ff9
-U drh
-Z 09287fc8a59d522f72c25c8db8fe6220
+P e65842a9d4c779d24207e8a7934fe3bf35ff228b
+R b83859050d5b26cf66a470937c7295fe
+U danielk1977
+Z 80bd2f8fe3f9e95b46cdb428645feda3

diff --git a/manifest.uuid b/manifest.uuid
index 0c690d5aed39c7cae15024864a92aa84963a90d7..02d522ec76460849634463b66580bfa527163f22 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e65842a9d4c779d24207e8a7934fe3bf35ff228b
\ No newline at end of file
+fe067d706b40d9756433eac9896660514d1c8216
\ No newline at end of file

diff --git a/src/test7.c b/src/test7.c
index 8e2153a1c128f5ec068369cc526d053cc1553c48..897d911bae4bdb184713618877e1d711b2e6fc78 100644 (file)
--- a/src/test7.c
+++ b/src/test7.c
@@ -12,7 +12,7 @@
 ** Code for testing the client/server version of the SQLite library.
 ** Derived from test4.c.
 **
-** $Id: test7.c,v 1.9 2007/09/12 17:01:45 danielk1977 Exp $
+** $Id: test7.c,v 1.10 2007/10/05 15:04:13 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -21,8 +21,8 @@
 ** This test only works on UNIX with a SQLITE_THREADSAFE build that includes
 ** the SQLITE_SERVER option.
 */
-#if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE)
-#if defined(OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
+#if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE) && \
+    defined(OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
 
 #include <stdlib.h>
 #include <string.h>
@@ -721,4 +721,3 @@ int Sqlitetest7_Init(Tcl_Interp *interp){
 #else
 int Sqlitetest7_Init(Tcl_Interp *interp){ return TCL_OK; }
 #endif /* OS_UNIX */
-#endif