Remove noise word "api" from "testsuite can call api" entrypoint

5 files changed, 25 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index 454d8c1..a38bb37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2020-12-27  Jacob Bachmeyer  <jcb@gnu.org>
+
+	* doc/dejagnu.texi (testsuite procedure): Remove noise word "api"
+	from new "testsuite can call api" feature test API entrypoint.
+	* lib/framework.exp (testsuite_can): Likewise.
+	* testsuite/runtest.libs/testsuite_can.test: Likewise.
+	* NEWS: Likewise.
+
 2020-12-16  Jacob Bachmeyer  <jcb@gnu.org>
 
 	* configure: Regenerate.
diff --git a/NEWS b/NEWS
index 91e2f84..d42be38 100644
--- a/NEWS
+++ b/NEWS
@@ -35,8 +35,8 @@ Changes since 1.6.2:
     or providing information about the current testsuite.
 14. A command "testsuite file" is added to replace the use of the "*dir"
     variables in test scripts.
-15. A command "testsuite can call api" is added to report the availability
-    of multiplexed API calls.
+15. A command "testsuite can call" is added to report the availability of
+    multiplexed API calls.
 16. A new multiplex procedure "testcase" is added for commands examining or
     manipulating the dynamic state of ongoing testing.
 17. A command "testcase group" is provided for reporting test groups to the
diff --git a/doc/dejagnu.texi b/doc/dejagnu.texi
index 9807313..b34c1c3 100644
--- a/doc/dejagnu.texi
+++ b/doc/dejagnu.texi
@@ -3394,15 +3394,15 @@ implied by the returned value will exist upon return.  Implied
 directories are created in the object tree if needed.  An error is
 raised if an implied directory does not exist in the source tree.
 
-@subsubheading testsuite can call api
+@subsubheading testsuite can call
 
-The @code{testsuite can call api} command is a feature test and
-returns a boolean value indicating if a subcommand under a multiplex
-point is available.  This API call is needed because only the
-multiplex points themselves are visible to the Tcl info command.
+The @code{testsuite can call} command is a feature test and returns a
+boolean value indicating if a subcommand under a multiplex point is
+available.  This API call is needed because only the multiplex points
+themselves are visible to the Tcl info command.
 
 @quotation
-@t{  @b{testsuite can call api} @i{feature}... }
+@t{  @b{testsuite can call} @i{feature}... }
 @end quotation
 
 Any number of words are joined together into a single name, beginning
diff --git a/lib/framework.exp b/lib/framework.exp
index 24afbed..d4cf6f9 100644
--- a/lib/framework.exp
+++ b/lib/framework.exp
@@ -1121,8 +1121,8 @@ namespace eval ::dejagnu {}
 proc testsuite_can { argv } {
     verbose "entering testsuite can $argv" 3
 
-    if { [lrange $argv 0 1] eq "call api" } {
-	set call [lrange $argv 2 end]
+    if { [lindex $argv 0] eq "call" } {
+	set call [lrange $argv 1 end]
 	set result [info exists ::dejagnu::apilist($call)]
     } else {
 	error "unknown feature test:  testsuite can $argv"
@@ -1131,7 +1131,7 @@ proc testsuite_can { argv } {
     verbose "leaving testsuite can: $result" 3
     return $result
 }
-array set ::dejagnu::apilist { {testsuite can call api} 1 }
+array set ::dejagnu::apilist { {testsuite can call} 1 }
 
 # Return a full file name in or near the testsuite
 #
diff --git a/testsuite/runtest.libs/testsuite_can.test b/testsuite/runtest.libs/testsuite_can.test
index b74b0b9..b9b6dbd 100644
--- a/testsuite/runtest.libs/testsuite_can.test
+++ b/testsuite/runtest.libs/testsuite_can.test
@@ -35,13 +35,13 @@ run_tests {
     { lib_errpat_test testsuite { can }
 	"*unknown feature test*"
 	"testsuite can without arguments" }
-    { lib_errpat_test testsuite { can call }
+    { lib_errpat_test testsuite { can bogus }
 	"*unknown feature test*"
-	"testsuite can call without 'api'" }
-    { lib_bool_test testsuite { can call api } false
-	"testsuite can call api returns false for null API call name" }
-    { lib_bool_test testsuite { can call api testsuite can call api } true
-	"testsuite can call api reports its own existence" }
+	"testsuite can call with bogus argument" }
+    { lib_bool_test testsuite { can call } false
+	"testsuite can call returns false for null API call name" }
+    { lib_bool_test testsuite { can call testsuite can call } true
+	"testsuite can call reports its own existence" }
 }
 
 puts "END testsuite_can.test"