libtool: Rename and reduce to one option, '--no-finish'

'--test' and '--check' options caused confusion with the previous
naming, so it has been updated to '--no-finish' for skipping
finish_cmds.

* build-aux/ltmain.in: Replace option names.
* doc/libtool.texi: Update.
* NEWS: Update.

diff --git a/NEWS b/NEWS
index 480a5430faaac17866c103c05e1bdb1cff0929df..b61b40247c54c1e4582deb7fe49c2af966420261 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,7 +4,7 @@ NEWS - list of user-visible changes between releases of GNU Libtool
 
 ** New features:
 
-  - New libtool command line flags, --test and --check, to skip executing
+  - New libtool command line flag, --no-finish, to skip executing
     finish_cmds that would alter the shared library cache during testing.
 
   - New libtool command line flag, --reorder-cache=DIRS, to reorder the

diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in
index b571c442c50bf7a6cead4361f5bf9df3d853ff80..1599fe740a142955ac1d24bff01e79865a9ed4f5 100644 (file)
--- a/build-aux/ltmain.in
+++ b/build-aux/ltmain.in
@@ -139,10 +139,10 @@ usage_message="Options:
    -n, --dry-run            display commands without modifying any files
        --features           display basic configuration information and exit
        --mode=MODE          use operation mode MODE
+       --no-finish          don't update shared library cache
        --no-warnings        equivalent to '-Wnone'
        --preserve-dup-deps  don't remove duplicate dependency libraries
        --reorder-cache=DIRS reorder shared library cache for preferred DIRS
-       --test, --check      don't update shared library cache during testing
        --quiet, --silent    don't print informational messages
        --tag=TAG            use configuration variables from tag TAG
    -v, --verbose            print more informational messages than default
@@ -380,7 +380,7 @@ libtool_options_prep ()
     opt_reorder_cache=false
     opt_preserve_dup_deps=false
     opt_quiet=false
-    opt_testing=true
+    opt_finishing=true
 
     nonopt=
     preserve_args=
@@ -478,6 +478,11 @@ libtool_parse_options ()
                         shift
                         ;;
 
+        --no-finish)
+                        opt_finishing=false
+                        func_append preserve_args " $_G_opt"
+                        ;;
+
         --no-silent|--no-quiet)
                         opt_quiet=false
                         func_append preserve_args " $_G_opt"
@@ -529,11 +534,6 @@ libtool_parse_options ()
                         func_append preserve_args " $_G_opt"
                         ;;
 
-        --test|--check)
-                        opt_testing=false
-                        func_append preserve_args " $_G_opt"
-                        ;;
-
         # An option not handled by this hook function:
         *)              set dummy "$_G_opt" ${1+"$@"} ; shift
                         _G_match_lt_parse_options=false
@@ -2245,7 +2245,7 @@ func_mode_finish ()
       fi
     fi
 
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs" && $opt_testing; then
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs" && $opt_finishing; then
       for libdir in $libdirs; do
        if test -n "$finish_cmds"; then
          # Do each command in the finish commands.
@@ -2270,7 +2270,7 @@ func_mode_finish ()
       for libdir in $libdirs; do
        $ECHO "   $libdir"
       done
-      if test "false" = "$opt_testing"; then
+      if test "false" = "$opt_finishing"; then
         echo
         echo "NOTE: finish_cmds were not executed during testing, so you must"
         echo "manually run ldconfig to add a given test directory, LIBDIR, to"

diff --git a/doc/libtool.texi b/doc/libtool.texi
index 9dfd57383c02b1198be10adb898f51e63b523be0..57212021bac48ccab7acea1efd2bc3accfb3ee96 100644 (file)
--- a/doc/libtool.texi
+++ b/doc/libtool.texi
@@ -1272,8 +1272,7 @@ stripped or the link will fail.  In cases where these duplications are
 required, this option will preserve them, only stripping the libraries
 that libtool knows it can safely.
 
-@item --test
-@itemx --check
+@item --no-finish
 Do not execute finish_cmds (disabled by default). This option is for
 specifying that testing of local changes to shared libraries is being
 performed so that ldconfig will not alter the shared library cache, which
@@ -1281,10 +1280,10 @@ is an issue observed on OpenBSD 7.5. This option should be combined with
 the usage of @option{--mode=install} and @option{--mode=finish} to have
 any effect. Prior to utilizing this option, the shared library cache must
 not contain links to the listed install directory for shared libraries
-undergoing testing; otherwise, it will have no useful effect. The shared
-library cache can be reordered to prefer directories for testing shared
-libraries over the directories already listed in the shared library cache
-with @option{--reorder-cache=@var{shared_lib_dirs}}.
+undergoing testing; otherwise, it will have no useful effect. In OpenBSD,
+the shared library cache can be reordered to prefer directories for
+testing shared libraries over the directories already listed in the shared
+library cache with @option{--reorder-cache=@var{shared_lib_dirs}}.
 
 @item --reorder-cache=@var{shared_lib_dirs}
 Reorder the shared library cache by providing the preferred directories
@@ -6913,7 +6912,7 @@ shell does not support the shell option @code{nocaseglob}, making
 @defvar finish_cmds
 Commands to tell the dynamic linker how to find shared libraries in a
 specific directory. These commands can be disabled during testing local
-changes to shared libraries with @option{--test} or @option{--check}.
+changes to shared libraries with @option{--no-finish}.
 @end defvar
 
 @defvar finish_eval