* gdb.mi/basics.c, gdb.mi/var-cmd.c: Revert last change.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.mi / mi-stack.exp

diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index 2bd12fabe38b77ea94faedc3aa5e818edebb059d..05ec32db3d09aad496227e5a0f1a86158cd4eeee 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -1,4 +1,4 @@
-# Copyright 2000, 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright 2000, 2001, 2002, 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
+set testfile "mi-stack"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
@@ -45,7 +45,7 @@ mi_gdb_load ${binfile}
 
 proc test_stack_frame_listing {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
 
     set line_callee4_head [gdb_get_line_number "callee4 ("]
     set line_callee4_body [expr $line_callee4_head + 2]
@@ -55,9 +55,10 @@ proc test_stack_frame_listing {} {
     # -stack-list-frames
     # -stack-list-frames 1 1
     # -stack-list-frames 1 3
+    # -stack-info-frame
 
     mi_gdb_test "231-stack-list-frames" \
-           "231\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*basics.c\",line=\"$line_callee4_body\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\},frame=\{level=\"4\",addr=\"$hex\",func=\"main\",.*\}\\\]" \
+           "231\\^done,stack=\\\[frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_body\"\},frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\},frame=\{level=\"2\",addr=\"$hex\",func=\"callee2\",.*\},frame=\{level=\"3\",addr=\"$hex\",func=\"callee1\",.*\},frame=\{level=\"4\",addr=\"$hex\",func=\"main\",.*\}\\\]" \
                 "stack frame listing"
     mi_gdb_test "232-stack-list-frames 1 1" \
            "232\\^done,stack=\\\[frame=\{level=\"1\",addr=\"$hex\",func=\"callee3\",.*\}\\\]" \
@@ -69,6 +70,10 @@ proc test_stack_frame_listing {} {
     mi_gdb_test "234-stack-list-frames 1" \
            "234\\^error,msg=\"mi_cmd_stack_list_frames: Usage.*FRAME_LOW FRAME_HIGH.*\"" \
            "stack frame listing wrong"
+
+    mi_gdb_test "235-stack-info-frame" \
+            "235\\^done,frame=\{level=\"0\",addr=\"$hex\",func=\"callee4\",file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_body\"\}" \
+              "selected frame listing"
 }
 
 proc test_stack_args_listing {} {
@@ -143,37 +148,37 @@ proc test_stack_info_depth {} {
 
 proc test_stack_locals_listing {} {
     global mi_gdb_prompt
-    global hex
+    global hex fullname_syntax srcfile
 
     # Obtain lists for locals for the stack frames
     # Tests:
-    # -stack-list-locals 0
-    # -stack-list-locals 1
-    # -stack-list-locals 2
+    # -stack-list-locals 0 (--no-values)
+    # -stack-list-locals 1 (--all-values)
+    # -stack-list-locals 2 (--simple-values)
     # -stack-list-arguments 
 
     mi_gdb_test "232-stack-list-locals 0" \
-           "232\\^done,locals=\\\[name=\"A\",name=\"B\",name=\"C\"\\\]" \
-                "stack locals listing 0"
+  "232\\^done,locals=\\\[name=\"A\",name=\"B\",name=\"C\",name=\"D\"\\\]" \
+                "stack locals listing of names"
 
 set line_callee4_return_0 [gdb_get_line_number "return 0;"]
 
-# step until A, B, C, have some reasonable values.
-send_gdb "-exec-next 3\n"
+# step until A, B, C, D have some reasonable values.
+send_gdb "-exec-next 4\n"
 gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*basics.c\",line=\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" {
+    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"\[01\]\",frame=\{addr=\"$hex\",func=\"callee4\",args=\\\[\\\],file=\".*${srcfile}\",fullname=\"${fullname_syntax}${srcfile}\",line=\"$line_callee4_return_0\"\}\r\n$mi_gdb_prompt$" {
        pass "next's in callee4"
     }
     timeout { fail "next in callee4 (timeout)" }
 }
 
     mi_gdb_test "232-stack-list-locals 1" \
-           "232\\^done,locals=\\\[\{name=\"A\",value=\"1\"\},\{name=\"B\",value=\"2\"\},\{name=\"C\",value=\"3\"\}\\\]" \
-                "stack locals listing 1"
+    "232\\^done,locals=\\\[\{name=\"A\",value=\"1\"\},\{name=\"B\",value=\"2\"\},\{name=\"C\",value=\"3\"\},\{name=\"D\",value=\"\\{0, 1, 2\\}\"\}\\\]" \
+                "stack locals listing of names and values"
 
     mi_gdb_test "232-stack-list-locals 2" \
-           "232\\^done,locals=\\\[\{name=\"A\",type=\"int\",value=\"1\"\},\{name=\"B\",type=\"int\",value=\"2\"\},\{name=\"C\",type=\"int\",value=\"3\"\}\\\]" \
-                "stack locals listing 2"
+           "232\\^done,locals=\\\[\{name=\"A\",type=\"int\",value=\"1\"\},\{name=\"B\",type=\"int\",value=\"2\"\},\{name=\"C\",type=\"int\",value=\"3\"\},\{name=\"D\",type=\"int \\\[3\\\]\"\}\\\]" \
+  "stack locals listing, simple types: names and values, complex type: names and types"
 
     mi_gdb_test "234-stack-list-locals" \
            "234\\^error,msg=\"mi_cmd_stack_list_locals: Usage.*PRINT_VALUES.*\"" \
@@ -187,16 +192,9 @@ gdb_expect {
            "232\\^done,locals=\\\[\\\]" \
                 "stack locals listing for new frame"
 
-# this should be a no-op
-
-    mi_gdb_test "232-stack-select-frame" \
-           "232\\^done" \
-                "stack select same frame"
-
     mi_gdb_test "232-stack-list-locals 1" \
            "232\\^done,locals=\\\[\\\]" \
                 "stack locals for same frame (level 1)"
-
 }
 
 mi_runto callee4