New ./configure option --enable-test-status causes testrunner.tcl to be

run with the --status option for targets like mdevtest and releasetest.

FossilOrigin-Name: 9ca8513c26e54c97f2d3c6105c42144100044727f6fb4c28048f7cd7270dd35e

diff --git a/Makefile.in b/Makefile.in
index 44665184fc17784aad4eeaaff26c6b5984a8982a..b8149f846f27b1944115e61822f8e913046382a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -117,6 +117,11 @@ HAVE_TCL = @HAVE_TCL@
 #
 TCLSH_CMD = @TCLSH_CMD@
 
+# Additional options when running tests using testrunner.tcl
+# This is usually either blank, or else --status
+#
+TSTRNNR_OPTS = @TSTRNNR_OPTS@
+
 # Where do we want to install the tcl plugin
 #
 TCLLIBDIR = @TCLLIBDIR@
@@ -1363,10 +1368,10 @@ testrunner:     testfixture$(TEXE)
 devtest:       srctree-check testfixture$(TEXE) fuzztest testrunner
 
 mdevtest: srctree-check has_tclsh85
-       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest
+       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl mdevtest $(TSTRNNR_OPTS)
 
 sdevtest: has_tclsh85
-       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl sdevtest
+       $(TCLSH_CMD) $(TOP)/test/testrunner.tcl sdevtest $(TSTRNNR_OPTS)
 
 # Validate that various generated files in the source tree
 # are up-to-date.
@@ -1377,7 +1382,7 @@ srctree-check:    $(TOP)/tool/srctree-check.tcl
 # Testing for a release
 #
 releasetest: srctree-check testfixture$(TEXE)
-       ./testfixture$(TEXE) $(TOP)/test/testrunner.tcl release
+       ./testfixture$(TEXE) $(TOP)/test/testrunner.tcl release $(TSTRNNR_OPTS)
 
 # Minimal testing that runs in less than 3 minutes
 #

diff --git a/configure b/configure
index 5f60385c28d33bdcb65e34d4653553d2687cde86..12f96ceba4e2f84b3a0d26771429bd7065867be1 100755 (executable)
--- a/configure
+++ b/configure
@@ -793,6 +793,7 @@ HAVE_WASI_SDK
 RELEASE
 VERSION
 program_prefix
+TSTRNNR_OPTS
 TCLLIBDIR
 HAVE_TCL
 TCL_STUB_LIB_SPEC
@@ -889,6 +890,7 @@ enable_largefile
 with_tclsh
 with_tcl
 enable_tcl
+enable_test_status
 with_wasi_sdk
 enable_threadsafe
 enable_releasemode
@@ -1546,6 +1548,8 @@ Optional Features:
   --disable-largefile     omit support for large files
   --disable-tcl           omit building accessory programs that require
                           TCL-dev
+  --enable-test-status    show status of testing targets using VT100 cursor
+                          movment
   --disable-threadsafe    Disable mutexing
   --enable-releasemode    Support libtool link to release mode
   --enable-tempstore      Use an in-ram database for temporary tables
@@ -3939,13 +3943,13 @@ if ${lt_cv_nm_interface+:} false; then :
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:3942: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3946: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3945: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3949: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3948: output\"" >&5)
+  (eval echo "\"\$as_me:3952: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5151,7 +5155,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5154 "configure"' > conftest.$ac_ext
+  echo '#line 5158 "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6676,11 +6680,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:6679: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6683: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6683: \$? = $ac_status" >&5
+   echo "$as_me:6687: \$? = $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.
@@ -7015,11 +7019,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:7018: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7022: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7022: \$? = $ac_status" >&5
+   echo "$as_me:7026: \$? = $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.
@@ -7120,11 +7124,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:7123: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7127: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7127: \$? = $ac_status" >&5
+   echo "$as_me:7131: \$? = $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
@@ -7175,11 +7179,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:7178: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7182: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7182: \$? = $ac_status" >&5
+   echo "$as_me:7186: \$? = $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
@@ -9555,7 +9559,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9558 "configure"
+#line 9562 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9651,7 +9655,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 9654 "configure"
+#line 9658 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10484,6 +10488,23 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then
   TCLLIBDIR="${TCLLIBDIR}/sqlite3"
 fi
 
+#########
+# Set up options for running tests.
+#
+# Check whether --enable-test-status was given.
+if test "${enable_test_status+set}" = set; then :
+  enableval=$enable_test_status; use_vt100=$enableval
+else
+  use_vt100=no
+fi
+
+if test $use_vt100; then
+  TSTRNNR_OPTS=--status
+else
+  TSTRNNR_OPTS=
+fi
+
+
 
 #########
 # Set up an appropriate program prefix

diff --git a/configure.ac b/configure.ac
index 2936c4ab5a45a337726e2b0c77c4c4c9f84fe135..6df65b9f13497b5fe7604554e6dde2a8e1d20bab 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -227,6 +227,18 @@ if test "x${TCLLIBDIR+set}" != "xset" ; then
   TCLLIBDIR="${TCLLIBDIR}/sqlite3"
 fi
 
+#########
+# Set up options for running tests.
+#
+AC_ARG_ENABLE(test-status, AS_HELP_STRING([--enable-test-status],[show status of testing targets using VT100 cursor movment]),
+      [use_vt100=$enableval],[use_vt100=no])
+if test $use_vt100; then
+  TSTRNNR_OPTS=--status
+else
+  TSTRNNR_OPTS=
+fi
+AC_SUBST(TSTRNNR_OPTS)
+
 
 #########
 # Set up an appropriate program prefix

diff --git a/manifest b/manifest
index 064ca3e7dd901f6ca172b53e0f8d010ce13d5ea3..18db7ded47b9f41048f82a1bc9eb6d409962b9e1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Remove\sa\sterm\sfrom\san\sassert()\sthat\sis\sno\slonger\srelevant.
-D 2024-08-24T18:42:39.760
+C New\s./configure\soption\s--enable-test-status\scauses\stestrunner.tcl\sto\sbe\nrun\swith\sthe\s--status\soption\sfor\stargets\slike\smdevtest\sand\sreleasetest.
+D 2024-08-24T19:02:33.721
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in 209e9c64edf499b0ea7a15448699101c01d15828af35a3439d32fc25fdf1b787
+F Makefile.in 101cb90f75c16ca3f8e7088364322441f9b01d6fdcef4a9c7f5fdcf78a3601a4
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 6c3fe8b6ce60e73f34a148c957d78b4648745c8d30e792423aa1a8d8bf12d065
 F README.md 3d47ef5758e2de29d6f4e1aca714d51424baba86c8b561fef330f6ef2dc9282c
@@ -35,8 +35,8 @@ F autoconf/tea/win/nmakehlp.c b01f822eabbe1ed2b64e70882d97d48402b42d2689a1ea0034
 F autoconf/tea/win/rules.vc 7b3bb2ef32ade0f3f14d951231811678722725e3bca240dd9727ae0dfe10f6a5
 F config.guess 883205ddf25b46f10c181818bf42c09da9888884af96f79e1719264345053bd6
 F config.sub c2d0260f17f3e4bc0b6808fccf1b291cb5e9126c14fc5890efc77b9fd0175559
-F configure 956e132a3e2481e5016e9ecaa0a2bdd9df95c1d923fa4fb2aa2cf9f0b3a54ad9 x
-F configure.ac fd9ff064b142682964971fec3d867235e51e1f6de30a031e33f683b7699338ff
+F configure b4c3cbde74d7bf7a3c046e2b9641c2784f67b0d3a8e56235a107e0a230fb26b0 x
+F configure.ac f084a0765a98bc76513d0fba69264164d72d20cbfbc84d85f0a4e8400425b8d5
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/F2FS.txt c1d4a0ae9711cfe0e1d8b019d154f1c29e0d3abfe820787ba1e9ed7691160fcd
 F doc/compile-for-windows.md e8635eea9153dcd6a51fd2740666ebc4492b3813cb1ac31cd8e99150df91762d
@@ -2210,8 +2210,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 bada54bd6bf54190e40aa721b77081015957d204c7b6a9fdbe8c67bcf20798f8
-R 00dd14ae6fd191eb1e24d275e84ccb9b
+P 8b4766252b80075354a6b1406c5430fe999a6490aa3e079893fcc682d88734f7
+R 624c0fde9a976c048fe809e58bc6f948
 U drh
-Z 4d530e51c1fc3bb001032c5e8c4a226a
+Z a7b786c85627cbad9eafd537f720c473
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 803a4f07f29cdb545106425f94d20ac7e8bf914c..af222d498c2f25bd98171a0ae2e936f784ee6325 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8b4766252b80075354a6b1406c5430fe999a6490aa3e079893fcc682d88734f7
+9ca8513c26e54c97f2d3c6105c42144100044727f6fb4c28048f7cd7270dd35e