Update the "make test" target so that it is really just "mdevtest" with

"srctree-check" and "sourcetest".

FossilOrigin-Name: 7420b13238da4e6bfb1589eaf3cfd842fe3c4b0f3b6a3b49c24cd70589bf4809

diff --git a/Makefile.in b/Makefile.in
index b8149f846f27b1944115e61822f8e913046382a4..d17d6830d0dc44d6ed3da21f4d11aa49596e810e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1381,18 +1381,16 @@ srctree-check:  $(TOP)/tool/srctree-check.tcl
 
 # Testing for a release
 #
-releasetest: srctree-check testfixture$(TEXE)
-       ./testfixture$(TEXE) $(TOP)/test/testrunner.tcl release $(TSTRNNR_OPTS)
+releasetest: srctree-check has_tclsh85
+       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl release $(TSTRNNR_OPTS)
 
 # Minimal testing that runs in less than 3 minutes
 #
 quicktest:     ./testfixture$(TEXE)
        ./testfixture$(TEXE) $(TOP)/test/extraquick.test $(TESTOPTS)
 
-# This is the common case.  Run many tests that do not take too long,
-# including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
-#
-test:  srctree-check fuzztest sourcetest $(TESTPROGS) tcltest
+test:  srctree-check sourcetest
+       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS)
 
 # Run a test using valgrind.  This can take a really long time
 # because valgrind is so much slower than a native machine.
@@ -1407,8 +1405,8 @@ valgrindtest:     $(TESTPROGS) valgrindfuzz
 smoketest:     $(TESTPROGS) fuzzcheck$(TEXE)
        ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
 
-shelltest: $(TESTPROGS)
-       ./testfixture$(TEXT) $(TOP)/test/permutations.test shell
+shelltest:
+       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl release shell
 
 sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in has_tclsh85
        $(TCLSH_CMD) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c

diff --git a/Makefile.msc b/Makefile.msc
index e31aee08998ca5bef41ac38c313f7b13eb3e6c86..e4420b1dea40cedbf627d3694e2fa40939f41a8d 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -2544,7 +2544,8 @@ quicktest:        testfixture.exe sourcetest
 # This is the common case.  Run many tests that do not take too long,
 # including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
 #
-test:  $(TESTPROGS) sourcetest fuzztest tcltest
+test:  srctree-check sourcetest
+       $(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest
 
 # The veryquick.test TCL tests.
 #
@@ -2565,10 +2566,16 @@ devtest:        testfixture.exe fuzztest testrunner
 mdevtest:
        $(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest
 
+# Validate that various generated files in the source tree
+# are up-to-date.
+#
+srctree-check: $(TOP)\tool\srctree-check.tcl
+       $(TCLSH_CMD) $(TOP)\tool\srctree-check.tcl
+
 # Testing for a release
 #
-releasetest: testfixture.exe
-       testfixture.exe $(TOP)\test\testrunner.tcl release
+releasetest:
+       $(TCLSH_CMD) $(TOP)\test\testrunner.tcl release
 
 
 smoketest:     $(TESTPROGS)

diff --git a/main.mk b/main.mk
index baf826041750c22ea23d250505d45f6cd1b724f7..ea6b83d059207c249d786c511dfdc6f3bb3e794f 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -971,9 +971,15 @@ mdevtest:
 quicktest:     ./testfixture$(EXE)
        ./testfixture$(EXE) $(TOP)/test/extraquick.test $(TESTOPTS)
 
-# The default test case.  Runs most of the faster standard TCL tests,
-# and fuzz tests, and sqlite3_analyzer and sqldiff tests.
-test:  fuzztest sourcetest $(TESTPROGS) tcltest
+# Validate that various generated files in the source tree
+# are up-to-date.
+#
+srctree-check: $(TOP)/tool/srctree-check.tcl
+       tclsh $(TOP)/tool/srctree-check.tcl
+
+# The default test case.
+test:  srctree-check sourcetest
+       tclsh $(TOP)/test/testrunner.tcl mdevtest
 
 
 # Run a test using valgrind.  This can take a really long time

diff --git a/manifest b/manifest
index b3678578487c847eed02a2c668b1d7b0e3a0c094..b4f5e7e97ff1175ee1ca042a9feb9dead525315c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Further\simprovements\sto\sthe\sstatus\sdisplay\sin\sorder\sto\smaximum\sthe\samount\sof\ninformation\sshown\son\sthe\slimited\sscreen\srealestate\savailable\swhen\srunning\nvia\s"watch"\sor\sin\scontinuous\smonitoring\smode.\s\sAll\sdetails\sare\sstill\sshown\nwhen\sdoing\sa\sstand-alone\s"status".
-D 2024-08-28T11:03:58.055
+C Update\sthe\s"make\stest"\starget\sso\sthat\sit\sis\sreally\sjust\s"mdevtest"\swith\n"srctree-check"\sand\s"sourcetest".
+D 2024-08-28T12:10:51.091
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 101cb90f75c16ca3f8e7088364322441f9b01d6fdcef4a9c7f5fdcf78a3601a4
+F Makefile.in d51de7cfc0500e54b7a8961218ce9d7fa115610f5353f98fd9b407a1a69dfdcc
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
-F Makefile.msc 6c3fe8b6ce60e73f34a148c957d78b4648745c8d30e792423aa1a8d8bf12d065
+F Makefile.msc fa422ec289537f61c5fe660e85ff4cab9389c3095a9071b5a0487aa521e657ba
 F README.md 3d47ef5758e2de29d6f4e1aca714d51424baba86c8b561fef330f6ef2dc9282c
 F VERSION 0db40f92c04378404eb45bff93e9e42c148c7e54fd3da99469ed21e22411f5a6
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -685,7 +685,7 @@ F ext/wasm/wasmfs.make 8a4955882aaa0783b3f60a9484a1f0f3d8b6f775c0fcd17c082f31966
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 9541ffdce424ddddb463e2480c3f1cb4067bbd3a6d2c84b3f083cb128a2fa721
+F main.mk 7a70a20e224bf9cdf518cafe7738000ef7b2aec7b7de19d3e49700301d6ff130
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2131,7 +2131,7 @@ F tool/max-limits.c cbb635fbb37ae4d05f240bfb5b5270bb63c54439
 F tool/merge-test.tcl de76b62f2de2a92d4c1ca4f976bce0aea6899e0229e250479b229b2a1914b176
 F tool/mkautoconfamal.sh cbdcf993fa83dccbef7fb77b39cdeb31ef9f77d9d88c9e343b58d35ca3898a6a
 F tool/mkccode.tcl 86463e68ce9c15d3041610fedd285ce32a5cf7a58fc88b3202b8b76837650dbe x
-F tool/mkctimec.tcl 060e9785e9503bf51f8b1b11b542bdeef90fd0ceb0738154f6762acec0c61e5f x
+F tool/mkctimec.tcl 48ca8eefa9e615cb9057ce6485b9c9ae5801381f24690d7d60b3b2dc8e6b7457 x
 F tool/mkkeywordhash.c b9faa0ae7e14e4dbbcd951cddd786bf46b8a65bb07b129ba8c0cfade723aaffd
 F tool/mkmsvcmin.tcl d76c45efda1cce2d4005bcea7b8a22bb752e3256009f331120fb4fecb14ebb7a
 F tool/mkopcodec.tcl 33d20791e191df43209b77d37f0ff0904620b28465cca6990cf8d60da61a07ef
@@ -2211,8 +2211,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 791237e0f4b67f0197ae11e966554edeade0c443289d2ade00470d23bf5e8ec8
-R d373eef32be36327da73bfcab1a028e6
+P 557a2c65f5ae1d8cb1858c17da0fe64fbfba83d787cfb7f2f21582960a8b9eac
+R 810ec2efa964f89a1c1304eac241e2a3
 U drh
-Z 38527615900da2d45d6401569f849a97
+Z a85e1bb31ced99882e1388879ef7a06f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 7e1aedcbf951beba6189bccf8b9f38f86c7e0f43..4a6b8643482215167d84637c2bafc489cde69981 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-557a2c65f5ae1d8cb1858c17da0fe64fbfba83d787cfb7f2f21582960a8b9eac
+7420b13238da4e6bfb1589eaf3cfd842fe3c4b0f3b6a3b49c24cd70589bf4809

diff --git a/tool/mkctimec.tcl b/tool/mkctimec.tcl
index 135164e3d1cebeb330e0a95c8b483d3a7ab7cbd7..7ca664a37e593a420004d3f9a7e30643bffc8465 100755 (executable)
--- a/tool/mkctimec.tcl
+++ b/tool/mkctimec.tcl
@@ -448,6 +448,7 @@ if {[catch {set cfd [open $destfile w]}]!=0} {
   puts stderr "File '$destfile' unwritable."
   exit 1;
 }
+fconfigure $cfd -translation binary
 
 puts $cfd $::headWarning;
 puts $cfd $::headCode;