From: drh <> Date: Wed, 28 Aug 2024 13:51:51 +0000 (+0000) Subject: Maybe [7420b13238da4e6b] was not such a good idea. Restore "make test" so X-Git-Tag: version-3.47.0~173 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ba5994b1818fea883217f0a930b0c819d0cfbed8;p=thirdparty%2Fsqlite.git Maybe [7420b13238da4e6b] was not such a good idea. Restore "make test" so that it works as before - running a single-threaded test over the source tree with options specified by ./configure and similar. Instead, change the "make devtest" target so that runs the automated multi-threaded tests on a standard configuration. FossilOrigin-Name: dc9fee980d4f4b5a569628702e52cef9e5d8e6c69c2b84546dce47e3e514775e --- diff --git a/Makefile.in b/Makefile.in index d17d6830d0..6f41c9bf81 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1363,9 +1363,14 @@ tcltest: ./testfixture$(TEXE) testrunner: testfixture$(TEXE) ./testfixture$(TEXE) $(TOP)/test/testrunner.tcl -# Runs both fuzztest and testrunner, consecutively. +# This is the testing target preferred by the core SQLite developers. +# It runs tests under a standard configuration, regardless of how +# ./configure was run. The devs run "make devtest" prior to each +# check-in, at a minimum. Probably other tests too, but at least this +# one. # -devtest: srctree-check testfixture$(TEXE) fuzztest testrunner +devtest: srctree-check sourcetest + $(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS) mdevtest: srctree-check has_tclsh85 $(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS) @@ -1389,8 +1394,13 @@ releasetest: srctree-check has_tclsh85 quicktest: ./testfixture$(TEXE) ./testfixture$(TEXE) $(TOP)/test/extraquick.test $(TESTOPTS) -test: srctree-check sourcetest - $(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS) +# Try to run tests on whatever options are specified by the +# ./configure. The developers seldom use this target. Instead +# they use "make devtest" which runs tests on a standard set of +# options regardless of how SQLite is configured. This "test" +# target is provided for legacy only. +# +test: srctree-check fuzztest sourcetest $(TESTPROGS) tcltest # Run a test using valgrind. This can take a really long time # because valgrind is so much slower than a native machine. diff --git a/Makefile.msc b/Makefile.msc index e4420b1dea..64b63a704e 100644 --- a/Makefile.msc +++ b/Makefile.msc @@ -2535,6 +2535,13 @@ queryplantest: testfixture.exe shell fuzztest: fuzzcheck.exe .\fuzzcheck.exe $(FUZZDATA) +# Legacy testing target for third-party integrators. The SQLite +# developers seldom use this target themselves. Instead +# they use "nmake /f Makefile.msc devtest" which runs tests on +# a standard set of options +# +test: $(TESTPROGS) sourcetest fuzztest tcltest + # Minimal testing that runs in less than 3 minutes (on a fast machine) # quicktest: testfixture.exe sourcetest @@ -2544,8 +2551,6 @@ 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: srctree-check sourcetest - $(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest # The veryquick.test TCL tests. # @@ -2559,9 +2564,13 @@ tcltest: testfixture.exe testrunner: testfixture.exe .\testfixture.exe $(TOP)\test\testrunner.tcl -# Runs both fuzztest and testrunner, consecutively. +# This is the testing target preferred by the core SQLite developers. +# It runs tests under a standard configuration. The devs run +# "nmake /f Makefile.msc devtest" prior to each check-in, at a minimum. +# Probably other tests too, but at least this one. # -devtest: testfixture.exe fuzztest testrunner +devtest: srctree-check sourcetest + $(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest mdevtest: $(TCLSH_CMD) $(TOP)\test\testrunner.tcl mdevtest diff --git a/main.mk b/main.mk index ea6b83d059..7926dd0501 100644 --- a/main.mk +++ b/main.mk @@ -958,9 +958,14 @@ tcltest: ./testfixture$(EXE) testrunner: testfixture$(EXE) ./testfixture$(EXE) $(TOP)/test/testrunner.tcl -# Runs both fuzztest and testrunner, consecutively. +# This is the testing target preferred by the core SQLite developers. +# It runs tests under a standard configuration, regardless of how +# ./configure was run. The devs run "make devtest" prior to each +# check-in, at a minimum. Probably other tests too, but at least this +# one. # -devtest: testfixture$(EXE) fuzztest testrunner +devtest: srctree-check sourcetest + tclsh $(TOP)/test/testrunner.tcl mdevtest mdevtest: tclsh $(TOP)/test/testrunner.tcl mdevtest @@ -977,10 +982,13 @@ quicktest: ./testfixture$(EXE) 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 - +# Try to run tests on whatever options are specified by the +# environment variables. The SQLite developers seldom use this target. +# Instead# they use "make devtest" which runs tests on a standard set of +# options regardless of how SQLite is configured. This "test" +# target is provided for legacy only. +# +test: fuzztest sourcetest $(TESTPROGS) tcltest # Run a test using valgrind. This can take a really long time # because valgrind is so much slower than a native machine. diff --git a/manifest b/manifest index cf14534781..a66a4cd72d 100644 --- a/manifest +++ b/manifest @@ -1,11 +1,11 @@ -C Minor\swording\schange\son\stestrunner\soutput. -D 2024-08-28T13:34:20.794 +C Maybe\s[7420b13238da4e6b]\swas\snot\ssuch\sa\sgood\sidea.\s\sRestore\s"make\stest"\sso\nthat\sit\sworks\sas\sbefore\s-\srunning\sa\ssingle-threaded\stest\sover\sthe\ssource\stree\nwith\soptions\sspecified\sby\s./configure\sand\ssimilar.\s\sInstead,\schange\sthe\n"make\sdevtest"\starget\sso\sthat\sruns\sthe\sautomated\smulti-threaded\stests\son\s\na\sstandard\sconfiguration. +D 2024-08-28T13:51:51.631 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in d51de7cfc0500e54b7a8961218ce9d7fa115610f5353f98fd9b407a1a69dfdcc +F Makefile.in 100a8ba2aee96203e57f0dfeb7c75befa7db0d9d17bdb5a7f814eaa60b974e16 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6 -F Makefile.msc fa422ec289537f61c5fe660e85ff4cab9389c3095a9071b5a0487aa521e657ba +F Makefile.msc 75946777a32696b6e894e686ba663f9dcdecea4730a827717e1b2be3b262234d 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 7a70a20e224bf9cdf518cafe7738000ef7b2aec7b7de19d3e49700301d6ff130 +F main.mk 70366119ceca019c618ab9acb1b4e8cb1ab5d342a6c4884a9d514f264bc0f2ca F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -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 7420b13238da4e6bfb1589eaf3cfd842fe3c4b0f3b6a3b49c24cd70589bf4809 -R 203b7adbe6856a41e47a582ad4a2ff84 +P 115e68597957a9ee80de7f554ee3768c992051687c8f07eaf3a9fcaab7efd44e +R 4897791cd3fac7134f1184e69605f11d U drh -Z ec83570cfd83b688d421f55742cc81eb +Z f3181ad81fdede715ff6716653ae5e00 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 507c4e1143..402ccd1247 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -115e68597957a9ee80de7f554ee3768c992051687c8f07eaf3a9fcaab7efd44e +dc9fee980d4f4b5a569628702e52cef9e5d8e6c69c2b84546dce47e3e514775e