Changes for consistent use of SQLITE_OS_UNIX and removal of legacy OS_UNIX from testf...

FossilOrigin-Name: 78b6eee200cab363be520d771375e44898f80e01

diff --git a/manifest b/manifest
index e93961cb7004fef84af9295b7c2e71d048da1608..9b8d4f0d8e4c5dc72293934f846d45a47a6a1368 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\sthe\s"--start=[permutation:][testfile]"\soption\sto\stester.tcl.\sFor\sstarting\squick.test\sor\sall.test\sat\sthe\snominated\spermutation\sand/or\stest\sfile.
-D 2011-04-04T15:38:16.948
+C Changes\sfor\sconsistent\suse\sof\sSQLITE_OS_UNIX\sand\sremoval\sof\slegacy\sOS_UNIX\sfrom\stestfixture\ssource;
+D 2011-04-04T21:48:01.840
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 7a4d9524721d40ef9ee26f93f9bd6a51dba106f2
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -188,10 +188,10 @@ F src/tclsqlite.c 501c9a200fd998a268be475be5858febc90b725b
 F src/test1.c 9ca440e80e16e53920904a0a5ac7feffb9b2c9a1
 F src/test2.c 80d323d11e909cf0eb1b6fbb4ac22276483bcf31
 F src/test3.c 056093cfef69ff4227a6bdb9108564dc7f45e4bc
-F src/test4.c 0528360b5025688002a5feb6be906ddce52eaaee
+F src/test4.c d1e5a5e904d4b444cf572391fdcb017638e36ff7
 F src/test5.c e1a19845625144caf038031234a12185e40d315c
 F src/test6.c c7256cc21d2409486d094277d5b017e8eced44ba
-F src/test7.c d67f65d82815eb0b57699b122ca0145dbea55bbb
+F src/test7.c 2e0781754905c8adc3268d8f0967e7633af58843
 F src/test8.c 6b1d12912a04fe6fca8c45bb9c3ea022f4352228
 F src/test9.c bea1e8cf52aa93695487badedd6e1886c321ea60
 F src/test_async.c 0612a752896fad42d55c3999a5122af10dcf22ad
@@ -199,7 +199,7 @@ F src/test_autoext.c 30e7bd98ab6d70a62bb9ba572e4c7df347fe645e
 F src/test_backup.c c129c91127e9b46e335715ae2e75756e25ba27de
 F src/test_btree.c 47cd771250f09cdc6e12dda5bc71bc0b3abc96e2
 F src/test_config.c 62f0f8f934b1d5c7e4cd4f506ae453a1117b47d7
-F src/test_demovfs.c 0aed671636735116fc872c5b03706fd5612488b5
+F src/test_demovfs.c 31050680fa6925b4f677cfd4fa965b5f19195e50
 F src/test_devsym.c e7498904e72ba7491d142d5c83b476c4e76993bc
 F src/test_func.c cbdec5cededa0761daedde5baf06004a9bf416b5
 F src/test_fuzzer.c f884f6f32e8513d34248d6e1ac8a32047fead254
@@ -214,17 +214,17 @@ F src/test_multiplex.c fdabd793ee7a9642c5a8a470def2347144c46d05
 F src/test_multiplex.h e99c571bc4968b7a9363b661481f3934bfead61d
 F src/test_mutex.c a6bd7b9cf6e19d989e31392b06ac8d189f0d573e
 F src/test_onefile.c 40cf9e212a377a6511469384a64b01e6e34b2eec
-F src/test_osinst.c f408c6a181f2fb04c56273afd5c3e1e82f60392c
+F src/test_osinst.c 62b0b8ef21ce754cc94e17bb42377ed8795dba32
 F src/test_pcache.c 7bf828972ac0d2403f5cfa4cd14da41f8ebe73d8
 F src/test_quota.c b5576f17d701af461effd7ca1e71f0d100071192
 F src/test_rtree.c 30c981837445a4e187ee850a49c4760d9642f7c3
 F src/test_schema.c 8c06ef9ddb240c7a0fcd31bc221a6a2aade58bf0
-F src/test_server.c bbba05c144b5fc4b52ff650a4328027b3fa5fcc6
+F src/test_server.c 88caa13d33cb85a4f924229bd9693acd8e1429ba
 F src/test_stat.c f682704b5d1ba8e1d4e7e882a6d7922e2dcf066c
 F src/test_superlock.c 2b97936ca127d13962c3605dbc9a4ef269c424cd
-F src/test_syscall.c 10ced09d6e9fba929531b25b46a8e5675f4f9940
+F src/test_syscall.c 162c4ec0137a549c009bb9ecab550527743cfc5d
 F src/test_tclvar.c f4dc67d5f780707210d6bb0eb6016a431c04c7fa
-F src/test_thread.c bedd05cad673dba53326f3aa468cc803038896c0
+F src/test_thread.c 361ae0a0f1cbf5a28ad0388a258b104017a370c0
 F src/test_vfs.c 2ed8853c1e51ac6f9ea091f7ce4e0d618bba8b86
 F src/test_vfstrace.c 2265c9895f350c8d3c39b079998fbe7481505cc1
 F src/test_wholenumber.c 6129adfbe7c7444f2e60cc785927f3aa74e12290
@@ -619,7 +619,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 627ccd04a113a193c375594bd5d6d051d8220658
+F test/releasetest.tcl 02497b7fb9c53fa65fc8757de7675987cd571068
 F test/rollback.test 1a83118ea6db4e7d8c10eaa63871b5e90502ffdc
 F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test e58e0acef38b527ed1b0b70d3ada588f804af287
@@ -926,7 +926,7 @@ F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P fda8fadd837e399d3fab7a9e6894617a5788d679
-R 4b62570a0a31579c57911e1ba72815ed
-U dan
-Z 8e0f703ae7b0d0dd238c3eeb189cec4d
+P a97e8505f229e05bf97ef9edbe063a52b581f339
+R 5b669314f67a239a5a132606db5a0d1b
+U shaneh
+Z 849485c22ade8d3120493afa3548d370

diff --git a/manifest.uuid b/manifest.uuid
index 91c9c36fff4e332c558baa4358bf73adf314bca6..89ec5b7576dd24dc0588b41a99ecbdc0752f10ff 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a97e8505f229e05bf97ef9edbe063a52b581f339
\ No newline at end of file
+78b6eee200cab363be520d771375e44898f80e01
\ No newline at end of file

diff --git a/src/test4.c b/src/test4.c
index 49447d351eb9b3be183b8edc0edb33c542447037..5c94370a3d4f6f723129689c1054c6722001cdc1 100644 (file)
--- a/src/test4.c
+++ b/src/test4.c
@@ -13,7 +13,7 @@
 */
 #include "sqliteInt.h"
 #include "tcl.h"
-#if defined(SQLITE_OS_UNIX) && OS_UNIX==1 && SQLITE_THREADSAFE
+#if SQLITE_OS_UNIX && SQLITE_THREADSAFE
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>

diff --git a/src/test7.c b/src/test7.c
index 3383d868d36fb546cc0c74c1e08fdd2e2a0cd0b9..852cd1db5e849f422180022cc41e7e00ac7de0ef 100644 (file)
--- a/src/test7.c
+++ b/src/test7.c
@@ -20,7 +20,7 @@
 ** the SQLITE_SERVER option.
 */
 #if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE) && \
-    defined(SQLITE_OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
+    SQLITE_OS_UNIX && SQLITE_THREADSAFE
 
 #include <stdlib.h>
 #include <string.h>

diff --git a/src/test_demovfs.c b/src/test_demovfs.c
index 8c51192b4c8e7e5393417e5d0525d591bc43884d..e56e8065cfbcd3cb73cfbf5d3535265b130998e8 100644 (file)
--- a/src/test_demovfs.c
+++ b/src/test_demovfs.c
@@ -115,7 +115,7 @@
 **   operations.
 */
 
-#if !defined(SQLITE_TEST) || defined(SQLITE_OS_UNIX)
+#if !defined(SQLITE_TEST) || SQLITE_OS_UNIX
 
 #include <sqlite3.h>
 
@@ -637,14 +637,14 @@ sqlite3_vfs *sqlite3_demovfs(void){
   return &demovfs;
 }
 
-#endif /* !defined(SQLITE_TEST) || defined(SQLITE_OS_UNIX) */
+#endif /* !defined(SQLITE_TEST) || SQLITE_OS_UNIX */
 
 
 #ifdef SQLITE_TEST
 
 #include <tcl.h>
 
-#ifdef SQLITE_OS_UNIX
+#if SQLITE_OS_UNIX
 static int register_demovfs(
   ClientData clientData, /* Pointer to sqlite3_enable_XXX function */
   Tcl_Interp *interp,    /* The TCL interpreter that invoked this command */

diff --git a/src/test_osinst.c b/src/test_osinst.c
index 25e9bcbfb0ab4a3b9848dbddca63672f3bd47e7d..50d6250e6c31fd0dc512f6849d23c90e99fa3dd2 100644 (file)
--- a/src/test_osinst.c
+++ b/src/test_osinst.c
@@ -213,14 +213,14 @@ static sqlite3_io_methods vfslog_io_methods = {
   vfslogShmUnmap                  /* xShmUnmap */
 };
 
-#if defined(SQLITE_OS_UNIX) && !defined(NO_GETTOD)
+#if SQLITE_OS_UNIX && !defined(NO_GETTOD)
 #include <sys/time.h>
 static sqlite3_uint64 vfslog_time(){
   struct timeval sTime;
   gettimeofday(&sTime, 0);
   return sTime.tv_usec + (sqlite3_uint64)sTime.tv_sec * 1000000;
 }
-#elif defined(SQLITE_OS_WIN)
+#elif SQLITE_OS_WIN
 #include <windows.h>
 #include <time.h>
 static sqlite3_uint64 vfslog_time(){

diff --git a/src/test_server.c b/src/test_server.c
index 3eb7544428f4bb36a0f207fe478a97917adb10c6..f7b596c78a7383d7798d1900aa656e6fed6d6609 100644 (file)
--- a/src/test_server.c
+++ b/src/test_server.c
@@ -206,7 +206,7 @@
 ** and only if the SQLITE_SERVER macro is defined.
 */
 #if defined(SQLITE_SERVER) && !defined(SQLITE_OMIT_SHARED_CACHE)
-#if defined(SQLITE_OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE
+#if SQLITE_OS_UNIX && SQLITE_THREADSAFE
 
 /*
 ** We require only pthreads and the public interface of SQLite.
@@ -487,5 +487,5 @@ void sqlite3_server_stop(void){
   pthread_mutex_unlock(&g.serverMutex);
 }
 
-#endif /* defined(SQLITE_OS_UNIX) && OS_UNIX && SQLITE_THREADSAFE */
+#endif /* SQLITE_OS_UNIX && SQLITE_THREADSAFE */
 #endif /* defined(SQLITE_SERVER) */

diff --git a/src/test_syscall.c b/src/test_syscall.c
index e3cdcfdfcef263c8131ddec309cdfb15ae1cf669..b8b05c5903b8b36eb78b8626171580367163aa8b 100644 (file)
--- a/src/test_syscall.c
+++ b/src/test_syscall.c
@@ -76,7 +76,7 @@
 #include <assert.h>
 
 #include "sqliteInt.h"
-#ifdef SQLITE_OS_UNIX
+#if SQLITE_OS_UNIX
 
 /* From test1.c */
 extern const char *sqlite3TestErrorName(int);

diff --git a/src/test_thread.c b/src/test_thread.c
index af38d91843314393708aef660b9d7446a0e1c6ee..ef191bc2d7cd07e06b5adb6235aecdc19947c74e 100644 (file)
--- a/src/test_thread.c
+++ b/src/test_thread.c
@@ -53,7 +53,7 @@ struct EvalEvent {
 
 static Tcl_ObjCmdProc sqlthread_proc;
 static Tcl_ObjCmdProc clock_seconds_proc;
-#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if SQLITE_OS_UNIX && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
 static Tcl_ObjCmdProc blocking_step_proc;
 static Tcl_ObjCmdProc blocking_prepare_v2_proc;
 #endif
@@ -116,7 +116,7 @@ static Tcl_ThreadCreateType tclScriptThread(ClientData pSqlThread){
   interp = Tcl_CreateInterp();
   Tcl_CreateObjCommand(interp, "clock_seconds", clock_seconds_proc, 0, 0);
   Tcl_CreateObjCommand(interp, "sqlthread", sqlthread_proc, pSqlThread, 0);
-#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if SQLITE_OS_UNIX && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
   Tcl_CreateObjCommand(interp, "sqlite3_blocking_step", blocking_step_proc,0,0);
   Tcl_CreateObjCommand(interp, 
       "sqlite3_blocking_prepare_v2", blocking_prepare_v2_proc, (void *)1, 0);
@@ -392,7 +392,7 @@ static int clock_seconds_proc(
 ** should be considered if these functions are to be extended (i.e. to 
 ** support windows) in the future.
 */ 
-#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if SQLITE_OS_UNIX && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
 
 /* BEGIN_SQLITE_BLOCKING_STEP */
 /* This example uses the pthreads API */
@@ -614,7 +614,7 @@ static int blocking_prepare_v2_proc(
 int SqlitetestThread_Init(Tcl_Interp *interp){
   Tcl_CreateObjCommand(interp, "sqlthread", sqlthread_proc, 0, 0);
   Tcl_CreateObjCommand(interp, "clock_seconds", clock_seconds_proc, 0, 0);
-#if defined(SQLITE_OS_UNIX) && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
+#if SQLITE_OS_UNIX && defined(SQLITE_ENABLE_UNLOCK_NOTIFY)
   Tcl_CreateObjCommand(interp, "sqlite3_blocking_step", blocking_step_proc,0,0);
   Tcl_CreateObjCommand(interp, 
       "sqlite3_blocking_prepare_v2", blocking_prepare_v2_proc, (void *)1, 0);

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
index 71ad4311b50240c0ed0de4ec42749c406caef041..788816b169027cd833f770e7d1c65327fb2f4fa3 100644 (file)
--- a/test/releasetest.tcl
+++ b/test/releasetest.tcl
@@ -64,7 +64,6 @@ array set ::Configs {
     -O2
     -DSQLITE_ENABLE_UNLOCK_NOTIFY
     -DSQLITE_THREADSAFE
-    -DOS_UNIX
     -DSQLITE_TCL_DEFAULT_FULLMUTEX=1
   }
   "Secure-Delete" {