From: dan <dan@noemail.net>
Date: Mon, 13 Sep 2010 12:15:36 +0000 (+0000)
Subject: Run the multi-threaded tests in test/threadtest3.c as part of releasetest.tcl. Remove... 
X-Git-Tag: experimental~38
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d38bc1b4faaecf604d3ba217f454d1635cd8083e;p=thirdparty%2Fsqlite.git

Run the multi-threaded tests in test/threadtest3.c as part of releasetest.tcl. Remove the OMIT_BUILTIN_TEST symbol from the "Device-Two" configuration.

FossilOrigin-Name: 3f5406e3231fbe84659712c9383b3e04cc6c11a8
---

diff --git a/main.mk b/main.mk
index b0186113a9..596d80ac58 100644
--- a/main.mk
+++ b/main.mk
@@ -523,6 +523,17 @@ soaktest:	testfixture$(EXE) sqlite3$(EXE)
 test:	testfixture$(EXE) sqlite3$(EXE)
 	./testfixture$(EXE) $(TOP)/test/veryquick.test
 
+# The next two rules are used to support the "threadtest" target. Building
+# threadtest runs a few thread-safety tests that are implemented in C. This
+# target is invoked by the releasetest.tcl script.
+# 
+threadtest3$(EXE): sqlite3.c $(TOP)/test/threadtest3.c
+	$(TCCX) -O2 sqlite3.c $(TOP)/test/threadtest3.c \
+		-o threadtest3$(EXE) $(THREADLIB)
+
+threadtest: threadtest3$(EXE)
+	./threadtest3$(EXE)
+
 sqlite3_analyzer$(EXE):	$(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
 			$(TOP)/tool/spaceanal.tcl
 	sed \
diff --git a/manifest b/manifest
index 7f7c22d31c..0a4c161999 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Alter\ssome\sconfigurations\sin\sreleasetest.tcl.\sPrint\sout\sthe\swall-clock\stime\staken\sfor\seach\stest\safter\sit\sis\sexecuted.
-D 2010-09-13T11:29:02
+C Run\sthe\smulti-threaded\stests\sin\stest/threadtest3.c\sas\spart\sof\sreleasetest.tcl.\sRemove\sthe\sOMIT_BUILTIN_TEST\ssymbol\sfrom\sthe\s"Device-Two"\sconfiguration.
+D 2010-09-13T12:15:37
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -97,7 +97,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk 1c6b2152dab78cc0c9f74958968c87fea232254c
+F main.mk fb18cac178225dca49b2a159f9d6bac3889429b2
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -571,7 +571,7 @@ F test/randexpr1.test 1084050991e9ba22c1c10edd8d84673b501cc25a
 F test/rdonly.test c267d050a1d9a6a321de502b737daf28821a518d
 F test/reindex.test 44edd3966b474468b823d481eafef0c305022254
 F test/releasetest.mk 2eced2f9ae701fd0a29e714a241760503ccba25a
-F test/releasetest.tcl 24c71eef618f08d5f36f073897ff58591872c17c
+F test/releasetest.tcl 627ccd04a113a193c375594bd5d6d051d8220658
 F test/rollback.test 1a83118ea6db4e7d8c10eaa63871b5e90502ffdc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
@@ -857,7 +857,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 43a99d9a88b1c3a6978e79ca21d49de6be2c9def
-R 825050fe30dfe1f265882fd9381bc39f
+P a91c5af3b033e326b868c3e6782650f6fe055b49
+R 9670e24acf30f41811da05ce30106d39
 U dan
-Z 742ab6b2a27fd40befa8ffdda2ed4654
+Z b8743623569d5bd7abbd9137a51a5792
diff --git a/manifest.uuid b/manifest.uuid
index 9def59b137..8fa9b44d6f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a91c5af3b033e326b868c3e6782650f6fe055b49
\ No newline at end of file
+3f5406e3231fbe84659712c9383b3e04cc6c11a8
\ No newline at end of file
diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index aefe7c7239..71ad4311b5 100644
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -119,7 +119,6 @@ array set ::Configs {
     -DSQLITE_ENABLE_RTREE=1
     -DSQLITE_MAX_COMPOUND_SELECT=50
     -DSQLITE_MAX_PAGE_SIZE=32768
-    -DSQLITE_OMIT_BUILTIN_TEST=1
     -DSQLITE_OMIT_TRACE=1
     -DSQLITE_TEMP_STORE=3
     -DSQLITE_THREADSAFE=2
@@ -157,18 +156,18 @@ array set ::Platforms {
     "Debug-One"               test
     "Extra-Robustness"        test
     "Device-Two"              test
-    "Default"                 test
+    "Default"                 "threadtest test"
     "Device-One"              fulltest
   }
   Linux-i686 {
     "Unlock-Notify"           "QUICKTEST_INCLUDE=notify2.test test"
-    "Device-Two"              test
     "Device-One"              test
-    "Default"                 fulltest
+    "Device-Two"              test
+    "Default"                 "threadtest fulltest"
   }
   Darwin-i386 {
     "Locking-Style"           test
-    "OS-X"                    fulltest
+    "OS-X"                    "threadtest fulltest"
   }
 }