This is the mail archive of the gdb-patches@sourceware.org mailing list for the GDB project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[RFA] gdb_expect -> gdb_test_multiple for filesym.exp


Hi,

Given the discussion yesterday on this, here is a patch to convert the test I committed yesterday to use gdb_test_multiple instead of gdb_expect.

Ok?
Keith

PS. I apparently neglected to commit my original ChangeLog entry for this patch. I will commit that (in its proper place) with this patch.

testsuite/ChangeLog
2013-05-16  Keith Seitz  <keiths@redhat.com>

	* gdb.base/filesym.exp: Use gdb_test_multiple insteadc of
	gdb_expect.

Index: testsuite/gdb.base/filesym.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/filesym.exp,v
retrieving revision 1.1
diff -u -p -r1.1 filesym.exp
--- testsuite/gdb.base/filesym.exp	15 May 2013 21:21:05 -0000	1.1
+++ testsuite/gdb.base/filesym.exp	16 May 2013 17:56:31 -0000
@@ -26,25 +26,21 @@ if {[prepare_for_testing $testfile.exp $
# complete to "filesym"; completing again, we expect the symbol name and the
 # filename (in that order).

+set tst "complete on \"filesy\""
 send_gdb "break filesy\t"
-gdb_expect {
-     -re "m\$" {
-	pass "complete on \"filesy\""
+gdb_test_multiple "" $tst {
+    -re "m\$" {
+	pass $tst

 	# Now ask for the completion list
+	set tst "completion list for \"filesym\""
 	send_gdb "\t\t"
-	gdb_expect {
+	gdb_test_multiple "" $tst {
 	    -re ".*filesym\[ \t\]+filesym.c.*$gdb_prompt break filesym\$" {
-		pass "completion list for \"filesym\""
-	    }
-
-	    default {
-		fail "completion list for \"filesym\""
+		pass $tst
 	    }
 	}
     }
-
-    default {
-	fail "complete on \"filesy\""
-    }
 }
+
+unset -nocomplain tst


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]