/ Check-in [d96de532]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix threadtest3 so that it builds using the autoconf build system.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:d96de532cc4a192cfebae900701dcee0a7d29273
User & Date: dan 2015-12-03 12:01:54
Context
2015-12-03
13:43
Make the sqlite3_status64(), sqlite3_strlike(), and sqlite3_db_cacheflush() APIs available to loadable extensions. check-in: a78e8656 user: drh tags: trunk
12:01
Fix threadtest3 so that it builds using the autoconf build system. check-in: d96de532 user: dan tags: trunk
11:51
Improve concurrency in test_multiplex.c. Add a switch to "threadtest3" allowing it to run using the multiplexor VFS. check-in: 9d2c62b0 user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

  1152   1152                     $(TOP)/test/tt3_checkpoint.c \
  1153   1153                     $(TOP)/test/tt3_index.c      \
  1154   1154                     $(TOP)/test/tt3_vacuum.c      \
  1155   1155                     $(TOP)/test/tt3_stress.c      \
  1156   1156                     $(TOP)/test/tt3_lookaside1.c
  1157   1157   
  1158   1158   threadtest3$(TEXE): sqlite3.lo $(THREADTEST3_SRC)
  1159         -	$(LTLINK) $(TOP)/test/threadtest3.c sqlite3.lo -o $@ $(TLIBS)
         1159  +	$(LTLINK) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.lo -o $@ $(TLIBS)
  1160   1160   
  1161   1161   threadtest: threadtest3$(TEXE)
  1162   1162   	./threadtest3$(TEXE)
  1163   1163   
  1164   1164   releasetest:	
  1165   1165   	$(TCLSH_CMD) $(TOP)/test/releasetest.tcl
  1166   1166   

Changes to main.mk.

   791    791   THREADTEST3_SRC = $(TOP)/test/threadtest3.c    \
   792    792                     $(TOP)/test/tt3_checkpoint.c \
   793    793                     $(TOP)/test/tt3_index.c      \
   794    794                     $(TOP)/test/tt3_vacuum.c      \
   795    795                     $(TOP)/test/tt3_stress.c      \
   796    796                     $(TOP)/test/tt3_lookaside1.c
   797    797   
   798         -threadtest3$(EXE): libsqlite3.a $(THREADTEST3_SRC) $(TOP)/src/test_multiplex.c
   799         -	$(TCCX) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c libsqlite3.a -o $@ $(THREADLIB)
          798  +threadtest3$(EXE): sqlite3.o $(THREADTEST3_SRC) $(TOP)/src/test_multiplex.c
          799  +	$(TCCX) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.o -o $@ $(THREADLIB)
   800    800   
   801    801   threadtest: threadtest3$(EXE)
   802    802   	./threadtest3$(EXE)
   803    803   
   804    804   TEST_EXTENSION = $(SHPREFIX)testloadext.$(SO)
   805    805   $(TEST_EXTENSION): $(TOP)/src/test_loadext.c
   806    806   	$(MKSHLIB) $(TOP)/src/test_loadext.c -o $(TEST_EXTENSION)

Changes to test/threadtest3.c.

    85     85   #include <sys/types.h> 
    86     86   #include <sys/stat.h> 
    87     87   #include <string.h>
    88     88   #include <fcntl.h>
    89     89   #include <errno.h>
    90     90   
    91     91   #include "test_multiplex.h"
           92  +
           93  +/* Required to link test_multiplex.c */
           94  +#ifndef SQLITE_OMIT_WSD
           95  +int sqlite3PendingByte = 0x40000000;
           96  +#endif
    92     97   
    93     98   /*
    94     99    * This code implements the MD5 message-digest algorithm.
    95    100    * The algorithm is due to Ron Rivest.  This code was
    96    101    * written by Colin Plumb in 1993, no copyright is claimed.
    97    102    * This code is in the public domain; do with it what you wish.
    98    103    *