[RFA/PATCH] testsuite cleanups (part 3)

[Elena Zannoni <ezannoni at redhat dot com>]

Similar to part 2. This completion.exp test was relying on the fact
that a Makefile was present in the current directory. Well, that's not
the case, when you do testing outside of the build tree.  Since there
is, immediately after, another test that check for completion on a
'file blah' command, I think we can toss this testcase.

Before doing this, I tried to do some convoluted matching on the first
line of output of "ls -1" in the current directory, but gave up, since
there are several "config*" files, and even trimming the string,
didn't guarantee uniqueness (so that competion would be successful),
then I thought of compelting on site.exp, but again, who knows if that
file will be around. So I took the shortcut.


elena

  * gdb.base/completion.exp: Remove reduntant completion test
  on filename.

Index: completion.exp
===================================================================
RCS file: /cvs/uberbaum/gdb/testsuite/gdb.base/completion.exp,v
retrieving revision 1.17
diff -u -p -r1.17 completion.exp
--- completion.exp	29 Jun 2003 20:32:23 -0000	1.17
+++ completion.exp	29 Jul 2003 19:33:10 -0000
@@ -611,7 +611,7 @@ gdb_expect  {
 }
 
 
-# The following tests used to simply try to complete `${objdir}/Make',
+# The following tests used to simply try to complete `${objdir}/file',
 # and so on.  The problem is that ${objdir} can be very long; the
 # completed filename may be more than eighty characters wide.  When
 # this happens, readline tries to manage things, producing output that
@@ -619,7 +619,7 @@ gdb_expect  {
 # recognize.
 #
 # In the case that motivated this change, the (gdb) prompt occupied
-# the leftmost six columns, and `${objdump}/' was seventy-four
+# the leftmost six columns, and `${objdir}/' was seventy-four
 # characters long --- eighty in all.  After printing the slash,
 # readline emitted a space, a carriage return, and then `Makefile'
 # (the tab character being received as input after `Make'.
@@ -631,36 +631,6 @@ gdb_expect  {
 #
 # So, we avoid long lines.  We `cd' to ${objdir} first, and then do
 # the completion relative to the current directory.
-#
-# Note that if we are building in the source tree, then there will be
-# more than one completion for ./Make, so we need to handle that also.
-# A better long term solution might be to create a temporary directory,
-# populate it with a set of known names, and use that directory to
-# test completions.
-
-gdb_test "cd ${objdir}" "Working directory ${objdir}.*" "cd to \${objdir}"
-send_gdb "file ./Make\t"
-sleep 1
-gdb_expect  {
-        -re "^file ./Make(\\\x07|)file.*$"\
-            { send_gdb "\n"
-              gdb_expect {
-                      -re "\r\nA program is being debugged already\\.  Kill it\\? \\(y or n\\) $"\
-                      { send_gdb "n\n"
-                        gdb_expect {
-                                -re "\r\nProgram not killed\\.\r\n$gdb_prompt $"\
-                                        { pass "complete 'file ./Make'"}
-                                -re ".*$gdb_prompt $" { fail "complete 'file ./Make'"}
-                                timeout           {fail "(timeout) complete 'file ./Make'"}
-                               }
-                      }
-                      -re ".*$gdb_prompt $" { fail "complete 'file ./Make'"}
-                      timeout           {fail "(timeout) complete 'file ./Make'"}
-                     }
-            }
-        -re ".*$gdb_prompt $"       { fail "complete 'file ./Make'" }
-        timeout         { fail "(timeout) complete 'file ./Make'" }
-        }
 
 # ${srcdir} may be a relative path.  We want to make sure we end up
 # in the right directory - so make sure we know where it is.