mirror of
https://github.com/sqlite/sqlite.git
synced 2024-11-21 19:29:09 +01:00
Get testfixture building.
FossilOrigin-Name: 9a7e56a01703fdcb4c83481d33d48bd4c8e6a5586c1315bae36fdff34a1b3bd1
This commit is contained in:
stephan
parent
883f35db10
commit
ead26840b8
83
Makefile.in
83
Makefile.in
@ -68,7 +68,7 @@ TCC += @TARGET_DEBUG@
|
||||
#XX#
|
||||
#XX## The library that programs using TCL must link against.
|
||||
#XX##
|
||||
#XX#LIBTCL = @TCL_LIB_SPEC@
|
||||
LIBTCL = @TCL_LIB_SPEC@
|
||||
#XX#
|
||||
# Compiler options needed for programs that use the readline() library.
|
||||
#
|
||||
@ -157,9 +157,9 @@ TCL_VERSION = @TCL_VERSION@
|
||||
#
|
||||
TSTRNNR_OPTS = @TSTRNNR_OPTS@
|
||||
|
||||
#XX## Where do we want to install the tcl plugin
|
||||
#XX##
|
||||
#XX#TCLLIBDIR = @TCLLIBDIR@
|
||||
# Where do we want to install the tcl plugin
|
||||
#
|
||||
TCLLIBDIR = @TCLLIBDIR@
|
||||
|
||||
#
|
||||
# If gcov support was enabled by the configure script, add the appropriate
|
||||
@ -752,12 +752,12 @@ sqlite_cfg.h: $(TOP)/sqlite_cfg.h.in $(AS_AUTO_DEF)
|
||||
|
||||
libsqlite3.DLL = libsqlite3$(TDLL)
|
||||
libsqlite3.LIB = libsqlite3$(TLIB)
|
||||
LDFLAGS_libsqlite = \
|
||||
$(LDFLAGS_RPATH) $(TLIBS) $(LDFLAGS_PTHREAD) \
|
||||
$(LDFLAGS_MATH) $(LDFLAGS_ZLIB)
|
||||
# LDFLAGS_libsqlite should be used with any target which
|
||||
# either results in building libsqlite3.so, builds sqlite3.c
|
||||
# directly, links in either of $(LIBOBJSO) or $(LIBOBJS1).
|
||||
LDFLAGS_libsqlite = \
|
||||
$(LDFLAGS_RPATH) $(TLIBS) $(LDFLAGS_PTHREAD) \
|
||||
$(LDFLAGS_MATH) $(LDFLAGS_ZLIB)
|
||||
|
||||
@if ENABLE_SHARED
|
||||
$(libsqlite3.DLL): $(LIBOBJ)
|
||||
@ -1038,8 +1038,11 @@ has_tclsh85:
|
||||
touch has_tclsh85
|
||||
|
||||
has_tclconfig:
|
||||
@ if test x"$(HAVE_TCL)" != "x1"; then echo 'ERROR: Requires access to "tclConfig.sh" which "configure" was not able to locate'; exit 1; fi
|
||||
@if !TCL_CONFIG_SH
|
||||
@echo 'ERROR: Requires access to "tclConfig.sh" which "configure" was not able to locate'; exit 1;
|
||||
@else
|
||||
touch has_tclconfig
|
||||
@endif
|
||||
|
||||
#
|
||||
# This target creates a directory named "tsrc" and fills it with
|
||||
@ -1516,37 +1519,37 @@ sqlite3rbu.o: $(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
|
||||
$(TCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rbu/sqlite3rbu.c
|
||||
|
||||
|
||||
#XX## Rules to build the 'testfixture' application.
|
||||
#XX##
|
||||
#XX## If using the amalgamation, use sqlite3.c directly to build the test
|
||||
#XX## fixture. Otherwise link against libsqlite3.la. (This distinction is
|
||||
#XX## necessary because the test fixture requires non-API symbols which are
|
||||
#XX## hidden when the library is built via the amalgamation).
|
||||
#XX##
|
||||
#XX#TESTFIXTURE_FLAGS = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
|
||||
#XX#TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
|
||||
#XX#TESTFIXTURE_FLAGS += -DBUILD_sqlite
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_STATIC_RANDOMJSON
|
||||
#XX#TESTFIXTURE_FLAGS += -DSQLITE_STRICT_SUBTYPE=1
|
||||
#XX#
|
||||
#XX#TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
|
||||
#XX#TESTFIXTURE_SRC1 = sqlite3.c
|
||||
#XX#TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
|
||||
#XX#TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
|
||||
#XX#
|
||||
#XX#testfixture$(TEXE): has_tclconfig has_tclsh85 $(TESTFIXTURE_SRC)
|
||||
#XX# $(TLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
|
||||
#XX# -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
|
||||
#XX#
|
||||
#XX#coretestprogs: testfixture$(BEXE) sqlite3$(BEXE)
|
||||
#XX#
|
||||
# Rules to build the 'testfixture' application.
|
||||
#
|
||||
# If using the amalgamation, use sqlite3.c directly to build the test
|
||||
# fixture. Otherwise link against libsqlite3.a. (This distinction is
|
||||
# necessary because the test fixture requires non-API symbols which are
|
||||
# hidden when the library is built via the amalgamation).
|
||||
#
|
||||
TESTFIXTURE_FLAGS = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
|
||||
TESTFIXTURE_FLAGS += -DTCLSH_INIT_PROC=sqlite3TestInit
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
|
||||
TESTFIXTURE_FLAGS += -DBUILD_sqlite
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_STMTVTAB
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_DBPAGE_VTAB
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_ENABLE_BYTECODE_VTAB
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_CKSUMVFS_STATIC
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_STATIC_RANDOMJSON
|
||||
TESTFIXTURE_FLAGS += -DSQLITE_STRICT_SUBTYPE=1
|
||||
|
||||
TESTFIXTURE_SRC0 = $(TESTSRC2) $(libsqlite3.LIB)
|
||||
TESTFIXTURE_SRC1 = sqlite3.c
|
||||
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
|
||||
TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
|
||||
|
||||
testfixture$(TEXE): has_tclconfig has_tclsh85 $(TESTFIXTURE_SRC)
|
||||
$(TLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
|
||||
-o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(LDFLAGS_libsqlite) @TCL_INCLUDE_SPEC@
|
||||
|
||||
coretestprogs: testfixture$(BEXE) sqlite3$(BEXE)
|
||||
|
||||
#XX#testprogs: $(TESTPROGS) srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE)
|
||||
#XX#
|
||||
#XX## A very detailed test running most or all test cases
|
||||
@ -1831,7 +1834,7 @@ tidy:
|
||||
rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE)
|
||||
rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE)
|
||||
rm -f threadtest5$(TEXE)
|
||||
rm -f src-verify has_tclsh*
|
||||
rm -f src-verify has_tclsh* has_tclconfig
|
||||
rm -f tclsqlite3.c
|
||||
rm -f sqlite3rc.h
|
||||
# FIXME? (rm *.def) will remove auto.def (part of autosetup)
|
||||
|
||||
49
auto.def
49
auto.def
@ -354,12 +354,13 @@ proc hwaci-check-tcl {} {
|
||||
set use_tcl $optTcl
|
||||
set with_tclsh [opt-val with-tclsh]
|
||||
set with_tcl [opt-val with-tcl]
|
||||
# puts "hwaci-check-tcl: use_tcl ${use_tcl}"
|
||||
# puts "hwaci-check-tcl: with_tclsh=${with_tclsh}"
|
||||
# puts "hwaci-check-tcl: with_tcl=$with_tcl"
|
||||
#puts "hwaci-check-tcl: use_tcl ${use_tcl}"
|
||||
#puts "hwaci-check-tcl: with_tclsh=${with_tclsh}"
|
||||
#puts "hwaci-check-tcl: with_tcl=$with_tcl"
|
||||
if {"" eq $with_tclsh && "" eq $with_tcl} {
|
||||
set with_tclsh [hwaci-first-bin-of tclsh8.6 tclsh tclsh9.0]
|
||||
set with_tclsh [hwaci-first-bin-of tclsh9.0 tclsh8.6 tclsh]
|
||||
}
|
||||
#puts "hwaci-check-tcl: with_tclsh=${with_tclsh}"
|
||||
|
||||
if {"" ne $with_tclsh} {
|
||||
if {![file isfile $with_tclsh]} {
|
||||
@ -371,7 +372,6 @@ proc hwaci-check-tcl {} {
|
||||
puts "Using tclsh at \"$with_tclsh\""
|
||||
}
|
||||
if {$use_tcl} {
|
||||
#set with_tcl [exec $with_tclsh $top_srcdir/tool/find_tclconfig.tcl]
|
||||
if {[catch {exec $with_tclsh $top_srcdir/tool/find_tclconfig.tcl} result] == 0} {
|
||||
set with_tcl $result
|
||||
}
|
||||
@ -385,7 +385,7 @@ proc hwaci-check-tcl {} {
|
||||
}
|
||||
|
||||
set cfg ""
|
||||
set tclSubdirs {tcl8.6 tcl9.0 lib}
|
||||
set tclSubdirs {tcl9.0 tcl8.6 lib}
|
||||
if {$use_tcl} {
|
||||
if {"" ne $with_tcl} {
|
||||
if {[file readable "${with_tcl}/tclConfig.sh"]} {
|
||||
@ -439,10 +439,23 @@ proc hwaci-check-tcl {} {
|
||||
# available, this generates empty-string entries for the various
|
||||
# options we're interested in.
|
||||
eval [exec "${top_srcdir}/tool/tclConfigShToTcl.sh" "[get-define TCL_CONFIG_SH]"]
|
||||
# puts "hwaci-check-tcl: with_tclsh=$with_tclsh"
|
||||
# puts "hwaci-check-tcl: with_tcl=$with_tcl"
|
||||
# puts "hwaci-check-tcl: cfg=$cfg"
|
||||
# puts "hwaci-check-tcl: use_tcl ${use_tcl}"
|
||||
#puts "hwaci-check-tcl: with_tclsh=$with_tclsh"
|
||||
#puts "hwaci-check-tcl: with_tcl=$with_tcl"
|
||||
#puts "hwaci-check-tcl: cfg=$cfg"
|
||||
#puts "hwaci-check-tcl: use_tcl ${use_tcl}"
|
||||
|
||||
if {"" eq $with_tclsh} {
|
||||
set with_tclsh [get-define TCL_EXEC_PREFIX]/bin/tclsh[get-define TCL_VERSION]
|
||||
if {![file executable $with_tclsh]} {
|
||||
set with_tclsh2 [get-define TCL_EXEC_PREFIX]/bin/tclsh
|
||||
if {![file executable $with_tclsh2]} {
|
||||
hwaci-warn "Cannot find a usable tclsh as $with_tclsh or $with_tclsh2"
|
||||
} else {
|
||||
set with_tclsh $with_tclsh2
|
||||
}
|
||||
}
|
||||
}
|
||||
define TCLSH_CMD $with_tclsh
|
||||
|
||||
if {$use_tcl} {
|
||||
# Set up the TCLLIBDIR and TCLLIB_RPATH
|
||||
@ -464,10 +477,26 @@ proc hwaci-check-tcl {} {
|
||||
set tcllibdir "${tcllibdir}/sqlite3"
|
||||
set rp [get-define SH_LINKRPATH]
|
||||
set tclrpath [string map [list "%s" $tcllibdir] $rp]
|
||||
# Reminder: tclConfig.sh has TCL_LD_SEARCH_FLAGS to set the
|
||||
# rpath but (A) it includes an unexpand var ref to
|
||||
# ${LIB_RUNTIME_DIR}, which must tbe set in the makefile and (B)
|
||||
# that flag is inherently compiler-dependent so it's not as
|
||||
# portable as tclConfig.sh assumes. We'll instead use the rpath
|
||||
# flag which autosetup determines for the current compiler.
|
||||
}
|
||||
define TCLLIBDIR $tcllibdir
|
||||
define TCLLIB_RPATH $tclrpath
|
||||
#hwaci-error "TCLLIB_RPATH = [get-define TCLLIB_RPATH]"
|
||||
} else {
|
||||
define TCLLIBDIR ""
|
||||
define TCLLIB_RPATH ""
|
||||
}
|
||||
|
||||
|
||||
if {"" eq $with_tclsh} {
|
||||
hwaci-warn "Cannot find a usable tclsh."
|
||||
} else {
|
||||
puts "Using tclsh: $with_tclsh"
|
||||
}
|
||||
}; # hwaci-check-tcl
|
||||
|
||||
|
||||
18
manifest
18
manifest
@ -1,9 +1,9 @@
|
||||
C Merge\strunk\sinto\sthis\sbranch.
|
||||
D 2024-10-16T13:02:07.918
|
||||
C Get\stestfixture\sbuilding.
|
||||
D 2024-10-16T14:04:00.330
|
||||
F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
|
||||
F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
|
||||
F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
|
||||
F Makefile.in e09c278841effbb93503fe3846337350bebc215f06c63f2c998e8cce7b109e8b
|
||||
F Makefile.in fa354ef30557591ef661274ed2e7e544ffe67946473ec5651bde26742c766686
|
||||
F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
|
||||
F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4
|
||||
F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
|
||||
@ -14,7 +14,7 @@ F art/icon-80x90.gif 65509ce3e5f86a9cd64fe7fca2d23954199f31fe44c1e09e208c80fb83d
|
||||
F art/sqlite370.eps aa97a671332b432a54e1d74ff5e8775be34200c2
|
||||
F art/sqlite370.ico af56c1d00fee7cd4753e8631ed60703ed0fc6e90
|
||||
F art/sqlite370.jpg d512473dae7e378a67e28ff96a34da7cb331def2
|
||||
F auto.def 42b2334f320fafcebb09673453fc9df470839e136d84ddeb74699af16b08b056
|
||||
F auto.def 9586e698e1cd80f072f3736fd179fd743cf3d85e16b56e1bdc2062b38c9e429e
|
||||
F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
|
||||
F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
|
||||
F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
|
||||
@ -23,7 +23,7 @@ F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
|
||||
F autoconf/README.txt 42cfd21d0b19dc7d5d85fb5c405c5f3c6a4c923021c39128f6ba685355d8fd56
|
||||
F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d5893b277
|
||||
F autoconf/tea/Makefile.in 106a96f2f745d41a0f6193f1de98d7355830b65d45032c18cd7c90295ec24196
|
||||
F autoconf/tea/README.txt 94fa2472d3ee4139ab24b364d99a70445d0a25531dac3ce03af2055d581f76b4 w autoconf/tea/README
|
||||
F autoconf/tea/README.txt 94fa2472d3ee4139ab24b364d99a70445d0a25531dac3ce03af2055d581f76b4
|
||||
F autoconf/tea/aclocal.m4 52c47aac44ce0ddb1f918b6993e8beb8eee88f43
|
||||
F autoconf/tea/configure.ac 0deb5d6c49c8119f75f436488219fc043127d72057af5dfba2c9ce096a5734bc
|
||||
F autoconf/tea/doc/sqlite3.n e1fe45d4f5286ee3d0ccc877aca2a0def488e9bb
|
||||
@ -2199,7 +2199,7 @@ F tool/spellsift.tcl 52b4b04dc4333c7ab024f09d9d66ed6b6f7c6eb00b38497a09f338fa55d
|
||||
F tool/split-sqlite3c.tcl 5aa60643afca558bc732b1444ae81a522326f91e1dc5665b369c54f09e20de60
|
||||
F tool/sqldiff.c 2a0987d183027c795ced13d6749061c1d2f38e24eddb428f56fa64c3a8f51e4b
|
||||
F tool/sqlite3_analyzer.c.in 348ba349bbdc93c9866439f9f935d7284866a2a4e6898bc906ae1204ade56918
|
||||
F tool/sqlite3_rsync.c 2a2b79a0463d400696aa9429be5c0ddec6b1f7ceefa5fed7acfdc859a435221f w tool/sqlite3-rsync.c
|
||||
F tool/sqlite3_rsync.c 2a2b79a0463d400696aa9429be5c0ddec6b1f7ceefa5fed7acfdc859a435221f
|
||||
F tool/sqltclsh.c.in 1bcc2e9da58fadf17b0bf6a50e68c1159e602ce057210b655d50bad5aaaef898
|
||||
F tool/sqltclsh.tcl 862f4cf1418df5e1315b5db3b5ebe88969e2a784525af5fbf9596592f14ed848
|
||||
F tool/src-verify.c d00f93263aa2fa6ba0cba0106d95458e6effb94fdb5fc634f56834f90c05bbb4
|
||||
@ -2238,8 +2238,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080
|
||||
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
|
||||
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
|
||||
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
|
||||
P 8d5f99f7e3f0ff9eaea1cb550369864e49a0fe0b00a53b1eba6ed099b61d8d24 86e794cbaa5ae600635c933b46298a39f2465daf4c5cd1570f2a03e19ac08d9d
|
||||
R 0f51619208545f999beb801583f35ef3
|
||||
P 9c3bb3dc4f5b5cd7db6cd50d22dbe8f933cccf5f2fd253467bb50f36b3207a93
|
||||
R 45a9e71fe8f588895d4532716f9e4e63
|
||||
U stephan
|
||||
Z b40f13e331b5567249a3bbe5622b7fa3
|
||||
Z a3d7258d39f45514e566632502958cc2
|
||||
# Remove this line to create a well-formed Fossil manifest.
|
||||
|
||||
@ -1 +1 @@
|
||||
9c3bb3dc4f5b5cd7db6cd50d22dbe8f933cccf5f2fd253467bb50f36b3207a93
|
||||
9a7e56a01703fdcb4c83481d33d48bd4c8e6a5586c1315bae36fdff34a1b3bd1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user