/ Check-in [54127602]
Login

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

Overview
Comment:In the MSVC makefile, add LIBTCLPATH variable to make it easier to run tests when the Tcl library is not already present in the PATH.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 54127602b9a555f73f5e446b91e460386cb8fb17
User & Date: mistachkin 2015-10-14 23:04:08
Context
2015-10-15
12:06
Make sure sqlite.h is not #included by itself. check-in: a61880c2 user: drh tags: trunk
2015-10-14
23:04
In the MSVC makefile, add LIBTCLPATH variable to make it easier to run tests when the Tcl library is not already present in the PATH. check-in: 54127602 user: mistachkin tags: trunk
22:46
In the MSVC makefile, make sure LDFLAGS is used for the tool executables as well. check-in: 0a17ee49 user: mistachkin tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.msc.

   568    568   !IFNDEF LIBTCL
   569    569   LIBTCL = tcl85.lib
   570    570   !ENDIF
   571    571   
   572    572   !IFNDEF LIBTCLSTUB
   573    573   LIBTCLSTUB = tclstub85.lib
   574    574   !ENDIF
          575  +
          576  +!IFNDEF LIBTCLPATH
          577  +LIBTCLPATH = c:\tcl\bin
          578  +!ENDIF
   575    579   
   576    580   # The locations of the ICU header and library files.  These variables
   577    581   # (ICUINCDIR, ICULIBDIR, and LIBICU) may be overridden via the environment
   578    582   # prior to running nmake in order to match the actual installed location on
   579    583   # this machine.
   580    584   #
   581    585   !IFNDEF ICUINCDIR
................................................................................
  1731   1735   testfixture.exe:	$(TESTFIXTURE_SRC) $(LIBRESOBJS) $(HDR)
  1732   1736   	$(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
  1733   1737   		-DBUILD_sqlite -I$(TCLINCDIR) \
  1734   1738   		$(TESTFIXTURE_SRC) \
  1735   1739   		/link $(LDFLAGS) $(LTLINKOPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LTLIBS) $(TLIBS)
  1736   1740   
  1737   1741   extensiontest: testfixture.exe testloadext.dll
         1742  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1738   1743   	.\testfixture.exe $(TOP)\test\loadext.test $(TESTOPTS)
  1739   1744   
  1740   1745   fulltest:	$(TESTPROGS) fuzztest
         1746  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1741   1747   	.\testfixture.exe $(TOP)\test\all.test $(TESTOPTS)
  1742   1748   
  1743   1749   soaktest:	$(TESTPROGS)
         1750  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1744   1751   	.\testfixture.exe $(TOP)\test\all.test -soak=1 $(TESTOPTS)
  1745   1752   
  1746   1753   fulltestonly:	$(TESTPROGS) fuzztest
         1754  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1747   1755   	.\testfixture.exe $(TOP)\test\full.test
  1748   1756   
  1749   1757   queryplantest:	testfixture.exe sqlite3.exe
         1758  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1750   1759   	.\testfixture.exe $(TOP)\test\permutations.test queryplanner $(TESTOPTS)
  1751   1760   
  1752   1761   fuzztest:	fuzzcheck.exe
  1753   1762   	.\fuzzcheck.exe $(FUZZDATA)
  1754   1763   
  1755   1764   fastfuzztest:	fuzzcheck.exe
  1756   1765   	.\fuzzcheck.exe --limit-mem 100M $(FUZZDATA)
  1757   1766   
  1758   1767   # Minimal testing that runs in less than 3 minutes (on a fast machine)
  1759   1768   #
  1760   1769   quicktest:	testfixture.exe
         1770  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1761   1771   	.\testfixture.exe $(TOP)\test\extraquick.test $(TESTOPTS)
  1762   1772   
  1763   1773   # This is the common case.  Run many tests that do not take too long,
  1764   1774   # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
  1765   1775   #
  1766   1776   test:	$(TESTPROGS) fastfuzztest
         1777  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1767   1778   	.\testfixture.exe $(TOP)\test\veryquick.test $(TESTOPTS)
  1768   1779   
  1769   1780   smoketest:	$(TESTPROGS)
         1781  +	@set PATH=$(LIBTCLPATH);$(PATH)
  1770   1782   	.\testfixture.exe $(TOP)\test\main.test $(TESTOPTS)
  1771   1783   
  1772   1784   sqlite3_analyzer.c: $(SQLITE3C) $(TOP)\src\tclsqlite.c $(TOP)\tool\spaceanal.tcl
  1773   1785   	echo #define TCLSH 2 > $@
  1774   1786   	echo #define SQLITE_ENABLE_DBSTAT_VTAB 1 >> $@
  1775   1787   	copy $@ + $(SQLITE3C) + $(TOP)\src\tclsqlite.c $@
  1776   1788   	echo static const char *tclsh_main_loop(void){ >> $@

Changes to tool/GetTclKit.bat.

   169    169   
   170    170   %__ECHO% ECHO SET TCLSH_CMD=%TEMP%\%TCLKIT_EXE%%OVERWRITE%"%ROOT%\SetTclKitEnv.bat"
   171    171   
   172    172   IF DEFINED TCLKIT_NOSDK GOTO skip_sdkVariables
   173    173   
   174    174   %__ECHO% ECHO SET TCLINCDIR=%TEMP%\%TCLKIT_SDK%\include%APPEND%"%ROOT%\SetTclKitEnv.bat"
   175    175   %__ECHO% ECHO SET TCLLIBDIR=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ROOT%\SetTclKitEnv.bat"
          176  +%__ECHO% ECHO SET LIBTCLPATH=%TEMP%\%TCLKIT_SDK%\lib%APPEND%"%ROOT%\SetTclKitEnv.bat"
   176    177   %__ECHO% ECHO SET LIBTCL=%TCLKIT_LIB%%APPEND%"%ROOT%\SetTclKitEnv.bat"
   177    178   %__ECHO% ECHO SET LIBTCLSTUB=%TCLKIT_LIB_STUB%%APPEND%"%ROOT%\SetTclKitEnv.bat"
   178    179   
   179    180   :skip_sdkVariables
   180    181   
   181    182   ECHO.
   182    183   ECHO Wrote "%ROOT%\SetTclKitEnv.bat".