From: shane Date: Fri, 21 Aug 2009 02:07:09 +0000 (+0000) Subject: Updates for test_init.c for configure and other consistency changes. X-Git-Tag: fts3-refactor~238 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e283794b698de7496eb69aeec50214b72cbde4d;p=thirdparty%2Fsqlite.git Updates for test_init.c for configure and other consistency changes. FossilOrigin-Name: 3ba316e9a32de406a4390fb3f52fccb48da4da30 --- diff --git a/Makefile.in b/Makefile.in index cf16aaa7b2..16b981d3be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -235,9 +235,9 @@ SRC = \ $(TOP)/src/os.c \ $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ + $(TOP)/src/os_os2.c \ $(TOP)/src/os_unix.c \ $(TOP)/src/os_win.c \ - $(TOP)/src/os_os2.c \ $(TOP)/src/pager.c \ $(TOP)/src/pager.h \ $(TOP)/src/parse.y \ @@ -381,6 +381,7 @@ TESTSRC = \ $(TOP)/src/test_devsym.c \ $(TOP)/src/test_func.c \ $(TOP)/src/test_hexio.c \ + $(TOP)/src/test_init.c \ $(TOP)/src/test_journal.c \ $(TOP)/src/test_malloc.c \ $(TOP)/src/test_md5.c \ @@ -391,7 +392,8 @@ TESTSRC = \ $(TOP)/src/test_schema.c \ $(TOP)/src/test_server.c \ $(TOP)/src/test_tclvar.c \ - $(TOP)/src/test_thread.c + $(TOP)/src/test_thread.c \ + $(TOP)/src/test_wsd.c # Header files used by all library source files. # diff --git a/main.mk b/main.mk index 56fbdc66d4..cbc08aa9b7 100644 --- a/main.mk +++ b/main.mk @@ -192,7 +192,7 @@ SRC += \ $(TOP)/ext/fts3/fts3_tokenizer1.c SRC += \ $(TOP)/ext/icu/sqliteicu.h \ - $(TOP)/ext/icu/icu.c + $(TOP)/ext/icu/icu.c SRC += \ $(TOP)/ext/rtree/rtree.h \ $(TOP)/ext/rtree/rtree.c @@ -241,7 +241,7 @@ TESTSRC = \ $(TOP)/src/test_server.c \ $(TOP)/src/test_tclvar.c \ $(TOP)/src/test_thread.c \ - $(TOP)/src/test_wsd.c \ + $(TOP)/src/test_wsd.c #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c #TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c diff --git a/manifest b/manifest index b3d0e5c5db..1f242c8181 100644 --- a/manifest +++ b/manifest @@ -1,10 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -C Remove\sa\sredundant\sOOM\stest\sfrom\sthe\ssqlite_stat2\sanalysis\sloader. -D 2009-08-20T23:05:32 +C Updates\sfor\stest_init.c\sfor\sconfigure\sand\sother\sconsistency\schanges. +D 2009-08-21T02:07:09 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 -F Makefile.in 0f7761c5d1c62ae7a841e3393ffaff1fa0f5c00a +F Makefile.in 73ddeec9dd10b85876c5c2ce1fdce627e1dcc7f8 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.vxworks 10010ddbf52e2503c7c49c7c0b7c7a096f8638a6 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac @@ -89,7 +86,7 @@ F ext/rtree/tkt3363.test 6662237ea75bb431cd5d262dfc9535e1023315fc F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 -F main.mk 3ae48161d5a76def45cd8fa253b28295f239dd69 +F main.mk f262640b2b84f0a9e55be18e86c2a1b6c45dc492 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac @@ -750,14 +747,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl 672f81d693a03f80f5ae60bfefacd8a349e76746 -P bbbee81075d923be7ca11e6e635c069a05d1605a -R eab239da7209787ec5732b09de9f9669 -U drh -Z 01e877d7ee7064d548c5aab76302e92a ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) - -iD8DBQFKjdbAoxKgR168RlERAvoTAJ4/zNxVT/sFvN+bAt9HmLCEGLDKFQCaAnsW -XXDCiaIyilF2mdCxXIokuSo= -=POqT ------END PGP SIGNATURE----- +P d30ceeb8b303e2ebfab2855beb973da606a97fa9 +R b6c943de06895c49e2a370130875c453 +U shane +Z 2aa9a5ab5a904bd727c216c0a651a78e diff --git a/manifest.uuid b/manifest.uuid index 873363a1c3..b69532a843 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d30ceeb8b303e2ebfab2855beb973da606a97fa9 \ No newline at end of file +3ba316e9a32de406a4390fb3f52fccb48da4da30 \ No newline at end of file