From: mlcreech Date: Fri, 14 Mar 2008 04:11:03 +0000 (+0000) Subject: Allow the testfixture to be built even when using the amalgamation (CVS 4860) X-Git-Tag: version-3.6.10~1317 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=969b2cd74af01758350e9c1210173d6e1b4ac0dc;p=thirdparty%2Fsqlite.git Allow the testfixture to be built even when using the amalgamation (CVS 4860) FossilOrigin-Name: 8a726e3731cd19cc52c6dab16d032d7237b7450b --- diff --git a/Makefile.in b/Makefile.in index 94a27adced..498a6ae130 100644 --- a/Makefile.in +++ b/Makefile.in @@ -269,9 +269,9 @@ SRC += \ SRC += \ $(TOP)/ext/icu/icu.c -# Source code to the test files. +# Source code to the library files needed by the test fixture # -TESTSRC = \ +TESTSRC2 = \ $(TOP)/src/attach.c \ $(TOP)/src/bitvec.c \ $(TOP)/src/btree.c \ @@ -291,6 +291,19 @@ TESTSRC = \ $(TOP)/src/printf.c \ $(TOP)/src/random.c \ $(TOP)/src/select.c \ + $(TOP)/src/tokenize.c \ + $(TOP)/src/utf.c \ + $(TOP)/src/util.c \ + $(TOP)/src/vdbe.c \ + $(TOP)/src/vdbeapi.c \ + $(TOP)/src/vdbeaux.c \ + $(TOP)/src/vdbemem.c \ + $(TOP)/src/where.c \ + parse.c + +# Source code to the actual test files. +# +TESTSRC = \ $(TOP)/src/test1.c \ $(TOP)/src/test2.c \ $(TOP)/src/test3.c \ @@ -312,16 +325,7 @@ TESTSRC = \ $(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 \ - $(TOP)/src/vdbe.c \ - $(TOP)/src/vdbeapi.c \ - $(TOP)/src/vdbeaux.c \ - $(TOP)/src/vdbemem.c \ - $(TOP)/src/where.c \ - parse.c + $(TOP)/src/test_thread.c # Header files used by all library source files. # @@ -357,6 +361,16 @@ HDR += \ $(TOP)/ext/fts3/fts3_hash.h \ $(TOP)/ext/fts3/fts3_tokenizer.h +# If using the amalgamation, use sqlite3.c directly to build the test +# fixture. Otherwise link against libsqlite3.la. (This distinction is +# necessary because the test fixture requires non-API symbols which are +# hidden when the library is built via the amalgamation). +# +TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la +TESTFIXTURE_SRC1 = sqlite3.c +TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) + + # This is the default Makefile target. The objects listed here # are what get build when you type just "make" with no arguments. # @@ -626,11 +640,10 @@ tclsqlite3$(TEXE): tclsqlite-shell.lo libsqlite3.la $(LTLINK) -o $@ tclsqlite-shell.lo \ libsqlite3.la $(LIBTCL) -testfixture$(TEXE): $(TOP)/src/tclsqlite.c libsqlite3.la $(TESTSRC) +testfixture$(TEXE): $(TESTFIXTURE_SRC) $(LTLINK) -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ - -DSQLITE_NO_SYNC=1 $(TEMP_STORE) \ - -o $@ $(TESTSRC) $(TOP)/src/tclsqlite.c \ - libsqlite3.la $(LIBTCL) + -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE $(TEMP_STORE) \ + -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) fulltest: testfixture$(TEXE) sqlite3$(TEXE) @@ -639,8 +652,7 @@ fulltest: testfixture$(TEXE) sqlite3$(TEXE) test: testfixture$(TEXE) sqlite3$(TEXE) ./testfixture$(TEXE) $(TOP)/test/quick.test -sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ - $(TESTSRC) $(TOP)/tool/spaceanal.tcl +sqlite3_analyzer$(TEXE): $(TESTFIXTURE_SRC) $(TOP)/tool/spaceanal.tcl sed \ -e '/^#/d' \ -e 's,\\,\\\\,g' \ @@ -648,9 +660,9 @@ sqlite3_analyzer$(TEXE): $(TOP)/src/tclsqlite.c libtclsqlite3.la \ -e 's,^,",' \ -e 's,$$,\\n",' \ $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h - $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 $(TEMP_STORE)\ - -o $@ $(TESTSRC) $(TOP)/src/tclsqlite.c \ - libtclsqlite3.la $(LIBTCL) + $(LTLINK) -DTCLSH=2 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1 \ + -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE \ + $(TEMP_STORE) -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) install: sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install} diff --git a/configure b/configure index ca0889c52c..f7536d35d5 100755 --- a/configure +++ b/configure @@ -1482,8 +1482,7 @@ Optional Features: --disable-readline disable readline support [default=detect] --enable-debug enable debugging & verbose explain --disable-amalgamation Disable the amalgamation and instead build all files - separately (currently needed to build the test - fixture) + separately --enable-load-extension Enable loading of external extensions Optional Packages: @@ -1946,7 +1945,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in -# $Revision: 1.54 $ +# $Revision: 1.55 $ ######### # Programs needed @@ -3697,7 +3696,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3700 "configure"' > conftest.$ac_ext + echo '#line 3699 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6376,11 +6375,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6379: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6378: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6383: \$? = $ac_status" >&5 + echo "$as_me:6382: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6644,11 +6643,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6647: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6646: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6651: \$? = $ac_status" >&5 + echo "$as_me:6650: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -6748,11 +6747,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6750: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6755: \$? = $ac_status" >&5 + echo "$as_me:6754: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9093,7 +9092,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11531: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11536: \$? = $ac_status" >&5 + echo "$as_me:11535: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11633,11 +11632,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11636: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11635: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11640: \$? = $ac_status" >&5 + echo "$as_me:11639: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13240,11 +13239,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13243: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13242: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13247: \$? = $ac_status" >&5 + echo "$as_me:13246: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13344,11 +13343,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13347: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13346: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13351: \$? = $ac_status" >&5 + echo "$as_me:13350: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15579,11 +15578,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15582: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15581: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15586: \$? = $ac_status" >&5 + echo "$as_me:15585: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15847,11 +15846,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15850: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15849: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15854: \$? = $ac_status" >&5 + echo "$as_me:15853: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -15951,11 +15950,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15954: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15953: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15958: \$? = $ac_status" >&5 + echo "$as_me:15957: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff --git a/configure.ac b/configure.ac index 6fb3c0e2c9..7584b0db4f 100644 --- a/configure.ac +++ b/configure.ac @@ -92,7 +92,7 @@ AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in -# $Revision: 1.40 $ +# $Revision: 1.41 $ ######### # Programs needed @@ -593,7 +593,7 @@ AC_SUBST(TARGET_DEBUG) ######### # See whether we should use the amalgamation to build AC_ARG_ENABLE(amalgamation, AC_HELP_STRING([--disable-amalgamation], - [Disable the amalgamation and instead build all files separately (currently needed to build the test fixture)]), + [Disable the amalgamation and instead build all files separately]), [use_amalgamation=$enableval],[use_amalgamation=yes]) if test "${use_amalgamation}" != "yes" ; then USE_AMALGAMATION=0 diff --git a/manifest b/manifest index 92d07d7fad..a2638ea782 100644 --- a/manifest +++ b/manifest @@ -1,7 +1,7 @@ -C One\sadditional\sintptr_t\sconversion\s(in\sthe\ssame\svein\sas\scheck-in\s4824)\s(CVS\s4859) -D 2008-03-13T23:34:38 +C Allow\sthe\stestfixture\sto\sbe\sbuilt\seven\swhen\susing\sthe\samalgamation\s(CVS\s4860) +D 2008-03-14T04:11:03 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 -F Makefile.in da3dc38c02b8ea7ba4a9b2e8cfe7d636590b709f +F Makefile.in 5be94fea84f1599672e5041de03b97990baca593 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac F VERSION 7a41970464b74225915bcaf9d76efd01f26e08f9 @@ -16,8 +16,8 @@ F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1 F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796 -F configure 69ee9f4ee66e801e05ff5460e6c262721ece5e0d x -F configure.ac 7fbcc49117d98dbdf6902812baf1f9eab1efe0ec +F configure d9527c8194653e4f53034f7eb81455d9359d18ab x +F configure.ac 19f513f0020508f5216e92549a734e5be12cba44 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac @@ -623,7 +623,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 63fc7b72078b1e12de39893dc8374a7e24703d2e -R 6912bc0a7d50353ae7880c54b007ae1c +P 2777ca788204c37ae5607f7acabe78f414255fa2 +R f16776db0cff304bef450ff1d0d825d3 U mlcreech -Z 6e50ae0269a44e135ed99d615cdc8ddd +Z 1f7928f0ce2ed78d708ad783393a6c28 diff --git a/manifest.uuid b/manifest.uuid index 49ac53ce62..af8445f93c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2777ca788204c37ae5607f7acabe78f414255fa2 \ No newline at end of file +8a726e3731cd19cc52c6dab16d032d7237b7450b \ No newline at end of file