* gdb.mi/mi-var-display.exp: Check for the existence of $fp

	before using it.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ca5641144ed71b958cb82254a26a3a06c49d9144..43549bf9b96718cd932660e6391d724b5b84a991 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-08  Maciej W. Rozycki  <macro@codesourcery.com>
+
+       * gdb.mi/mi-var-display.exp: Check for the existence of $fp
+       before using it.
+
 2012-05-04  Tristan Gingold  <gingold@adacore.com>
 
        * gdb.base/set-noassign.exp: New test.

diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index c508681f0f79a9e2e4977f9429e41190f309d46b..b3ae2c504b480cba604da050d7186dda469c7b2c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -614,9 +614,13 @@ mi_gdb_test "-var-create a1 * a" \
        "\\^done,name=\"a1\",numchild=\"0\",value=\".*\",type=\"char\".*" \
        "create local variable a1"
 
-mi_gdb_test "-var-create a2 $fp a" \
+if { [info exists fp] } {
+    mi_gdb_test "-var-create a2 $fp a" \
        "\\^done,name=\"a2\",numchild=\"0\",value=\".*\",type=\"int\".*" \
        "create variable a2 in different scope"
+} else {
+    untested "create variable a2 in different scope"
+}
 
 #gdbtk_test c_variable-7.81 {create variables in different scopes} {
 #  set a1 [gdb_variable create -expr a]