From 316935f0ad534e72f4e7d607d933a4ab71963f09 Mon Sep 17 00:00:00 2001
From: Doug Evans <xdje42@gmail.com>
Date: Mon, 8 Sep 2014 23:01:01 -0700
Subject: [PATCH] Fix regression in default.exp caused by _caller_is, etc.

gdb/testsuite/ChangeLog:

	* gdb.base/default.exp (show_conv_list): Add _caller_is,
	_caller_matches, _any_caller_is, _any_caller_matches.
---
 gdb/testsuite/ChangeLog            | 5 +++++
 gdb/testsuite/gdb.base/default.exp | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d5ebf48..3fc2680 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 2014-09-09  Doug Evans  <xdje42@gmail.com>
 
+	* gdb.base/default.exp (show_conv_list): Add _caller_is,
+	_caller_matches, _any_caller_is, _any_caller_matches.
+
+2014-09-09  Doug Evans  <xdje42@gmail.com>
+
 	* gdb.guile/scm-error.exp: Handle guile 2.2 backtrace output.
 
 2014-09-09  Yao Qi  <yao@codesourcery.com>
diff --git a/gdb/testsuite/gdb.base/default.exp b/gdb/testsuite/gdb.base/default.exp
index 6674df3..ab74bdb 100644
--- a/gdb/testsuite/gdb.base/default.exp
+++ b/gdb/testsuite/gdb.base/default.exp
@@ -630,6 +630,10 @@ if ![skip_python_tests] {
 	    {$_regex = <internal function _regex>} \
 	    {$_streq = <internal function _streq>} \
 	    {$_strlen = <internal function _strlen>} \
+	    {$_caller_is = <internal function _caller_is>} \
+	    {$_caller_matches = <internal function _caller_matches>} \
+	    {$_any_caller_is = <internal function _any_caller_is>} \
+	    {$_any_caller_matches = <internal function _any_caller_matches>} \
 	}
 }
 gdb_test_list_exact "show convenience" "show convenience" \
-- 
2.7.4