]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - gdb/testsuite/gdb.mi/mi-var-cmd.exp
Fix some duplicate test names
[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.mi / mi-var-cmd.exp
index f1fcedd26f4bf9013325759a908f0f0234ff7668..260917a906bf682e1a84abc592fc9ffaebd9bce4 100644 (file)
@@ -1,8 +1,8 @@
-#   Copyright (C) 1999 2000 Cygnus Solutions
+# Copyright 1999-2020 Free Software Foundation, Inc.
 #
-# This Program Is Free software; you can redistribute it and/or modify
+# 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # Test essential Machine interface (MI) operations
 #
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+standard_testfile var-cmd.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested "failed to compile"
+    return -1
 }
 
 mi_delete_breakpoints
@@ -51,110 +48,80 @@ mi_gdb_load ${binfile}
 # Test:  c_variable-1.1
 # Desc:  Create global variable
 
-mi_gdb_test "111-var-create global_simple * global_simple" \
-       "111\\^done,name=\"global_simple\",numchild=\"6\",type=\"simpleton\"" \
-       "create global variable"
+mi_create_varobj "global_simple" "global_simple" "create global variable"
+
+# PR mi/15863
+# Attempt to update the varobj before running the inferior.
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\\\]" \
+       "update varobj before running inferior"
 
 # Test: c_variable-1.2
 # Desc: Create non-existent variable
 
 mi_gdb_test "112-var-create bogus_unknown_variable * bogus_unknown_variable" \
-       "&\"mi_cmd_var_create: unable to create variable object\\\\n\".*112\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
+       "112\\^error,msg=\"-var-create: unable to create variable object\"" \
        "create non-existent variable"
 
 # Test: c_variable-1.3
 # Desc: Create out of scope variable
 
 mi_gdb_test "113-var-create argc * argc" \
-       "&\"mi_cmd_var_create: unable to create variable object\\\\n\".*113\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
+       "113\\^error,msg=\"-var-create: unable to create variable object\"" \
        "create out of scope variable"
 
-mi_gdb_test "200-break-insert do_locals_tests" \
-       "200\\^done,bkpt=\{number=\"1\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"do_locals_tests\",file=\".*var-cmd.c\",line=\"106\",times=\"0\"\}" \
-       "break-insert operation"
-
-mi_run_cmd
-# The running part has been checked already by mi_run_cmd
-gdb_expect {
-    -re "\[\r\n\]*000\\*stopped,reason=\"breakpoint-hit\",bkptno=\"1\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"106\"\}\r\n$mi_gdb_prompt$" {
-       pass "run to do_locals_tests"
-    }
-    -re ".*$mi_gdb_prompt$" {fail "run todo_locals_tests (2)"}
-    timeout {fail "run to do_locals_tests (timeout 2)"}
+with_test_prefix "first run" {
+  mi_runto do_locals_tests
 }
 
+set line_dlt_first_real [gdb_get_line_number "linteger = 1234;"]
+
+mi_continue_to_line $line_dlt_first_real "step to real start of do_locals_test"
+
+
 # Test: c_variable-1.4
 # Desc: create local variables
 
-mi_gdb_test "-var-create linteger * linteger" \
-       "\\^done,name=\"linteger\",numchild=\"0\",type=\"int\"" \
-       "create local variable linteger"
+mi_create_varobj_checked linteger linteger int "create local variable linteger"
 
-mi_gdb_test "-var-create lpinteger * lpinteger" \
-       "\\^done,name=\"lpinteger\",numchild=\"1\",type=\"int \\*\"" \
-       "create local variable lpinteger"
+mi_create_varobj_checked lpinteger lpinteger {int \*} "create local variable lpinteger"
 
-mi_gdb_test "-var-create lcharacter * lcharacter" \
-       "\\^done,name=\"lcharacter\",numchild=\"0\",type=\"char\"" \
-       "create local variablelcharacter "
+mi_create_varobj_checked lcharacter lcharacter\[0\] char "create local variable lcharacter"
 
-mi_gdb_test "-var-create lpcharacter * lpcharacter" \
-       "\\^done,name=\"lpcharacter\",numchild=\"0\",type=\"char \\*\"" \
-       "create local variable lpcharacter"
+mi_create_varobj_checked lpcharacter lpcharacter {char \*} "create local variable lpcharacter"
 
-mi_gdb_test "-var-create llong * llong" \
-       "\\^done,name=\"llong\",numchild=\"0\",type=\"long int\"" \
-       "create local variable llong"
+mi_create_varobj_checked llong llong "long" "create local variable llong"
 
-mi_gdb_test "-var-create lplong * lplong" \
-       "\\^done,name=\"lplong\",numchild=\"1\",type=\"long int \\*\"" \
-       "create local variable lplong"
+mi_create_varobj_checked lplong lplong {long \*} "create local variable lplong"
 
-mi_gdb_test "-var-create lfloat * lfloat" \
-       "\\^done,name=\"lfloat\",numchild=\"0\",type=\"float\"" \
-       "create local variable lfloat"
+mi_create_varobj_checked lfloat lfloat float "create local variable lfloat"
 
-mi_gdb_test "-var-create lpfloat * lpfloat" \
-       "\\^done,name=\"lpfloat\",numchild=\"1\",type=\"float \\*\"" \
-       "create local variable lpfloat"
+mi_create_varobj_checked lpfloat lpfloat {float \*} "create local variable lpfloat"
 
-mi_gdb_test "-var-create ldouble * ldouble" \
-       "\\^done,name=\"ldouble\",numchild=\"0\",type=\"double\"" \
-       "create local variable ldouble"
+mi_create_varobj_checked ldouble ldouble double "create local variable ldouble"
 
-mi_gdb_test "-var-create lpdouble * lpdouble" \
-       "\\^done,name=\"lpdouble\",numchild=\"1\",type=\"double \\*\"" \
-       "create local variable lpdouble"
+mi_create_varobj_checked lpdouble lpdouble {double \*} "create local variable lpdouble"
 
-mi_gdb_test "-var-create lsimple * lsimple" \
-       "\\^done,name=\"lsimple\",numchild=\"6\",type=\"struct _simple_struct\"" \
-       "create local variable lsimple"
+mi_create_varobj_checked lsimple lsimple "struct _simple_struct" "create local variable lsimple"
 
-mi_gdb_test "-var-create lpsimple * lpsimple" \
-       "\\^done,name=\"lpsimple\",numchild=\"6\",type=\"struct _simple_struct \\*\"" \
-       "create local variable lpsimple"
+mi_create_varobj_checked lpsimple lpsimple {struct _simple_struct \*} "create local variable lpsimple"
 
-mi_gdb_test "-var-create func * func" \
-       "\\^done,name=\"func\",numchild=\"0\",type=\"void \\(\\*\\)\\(\\)\"" \
-       "create local variable func"
+mi_create_varobj_checked func func {void \(\*\)\((void|)\)} "create local variable func"
 
 # Test: c_variable-1.5
 # Desc: create lsimple.character
-mi_gdb_test "-var-create lsimple.character * lsimple.character" \
-       "\\^done,name=\"lsimple.character\",numchild=\"0\",type=\"char\"" \
+mi_create_varobj_checked lsimple.character lsimple.character "char" \
        "create lsimple.character"
 
 # Test: c_variable-1.6
 # Desc: create lpsimple->integer
-mi_gdb_test "-var-create lsimple->integer * lsimple->integer" \
-       "\\^done,name=\"lsimple->integer\",numchild=\"0\",type=\"int\"" \
+mi_create_varobj_checked lsimple->integer lsimple->integer "int" \
        "create lsimple->integer"
 
 # Test: c_variable-1.7
-# Desc: ceate lsimple.integer
-mi_gdb_test "-var-create lsimple.integer * lsimple.integer" \
-       "\\^done,name=\"lsimple.integer\",numchild=\"0\",type=\"int\"" \
-       "create lsimple->integer"
+# Desc: create lsimple.integer
+mi_create_varobj_checked lsimple.integer lsimple.integer "int" \
+       "create lsimple.integer"
 
 
 # Test: c_variable-1.9
@@ -162,7 +129,7 @@ mi_gdb_test "-var-create lsimple.integer * lsimple.integer" \
 #    Type names (like int, long, etc..) are all proper expressions to gdb.
 #    make sure variable code does not allow users to create variables, though.
 mi_gdb_test "-var-create int * int" \
-       "&\"Attempt to use a type name as an expression.mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
+       "&\"Attempt to use a type name as an expression.\\\\n\".*\\^error,msg=\"-var-create: unable to create variable object\"" \
        "create int"
 
 
@@ -175,75 +142,44 @@ mi_gdb_test "-var-create int * int" \
 # Test: c_variable-2.1
 # Desc: check whether values changed at do_block_tests
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{\}" \
+       "\\^done,changelist=\\\[\\\]" \
        "update all vars"
 
 # Step over "linteger = 1234;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"107\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+set line_dlt_linteger [gdb_get_line_number "lpinteger = &linteger;"]
+mi_step_to "do_locals_tests" "" "var-cmd.c" $line_dlt_linteger "step at do_locals_test"
 
 # Test: c_variable-2.2
 # Desc: check whether only linteger changed values
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: linteger changed"
 
 # Step over "lpinteger = &linteger;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"108\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 1] "step at do_locals_tests (2)"
 
 # Test: c_variable-2.3
 # Desc: check whether only lpinteger changed
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: lpinteger changed"
 
 # Step over "lcharacter = 'a';"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"109\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 2] "step at do_locals_tests (3)"
 
 # Test: c_variable-2.4
 # Desc: check whether only lcharacter changed
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: lcharacter changed"
 
 # Step over "lpcharacter = &lcharacter;"
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"110\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+mi_step_to "do_locals_tests" "" "var-cmd.c" [expr $line_dlt_linteger + 3] "step at do_locals_tests (4)"
 
 # Test: c_variable-2.5
 # Desc: check whether only lpcharacter changed
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"lpcharacter\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"lpcharacter\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: lpcharacter changed"
 
 
@@ -258,21 +194,14 @@ mi_gdb_test "-var-update *" \
 #  lsimple.unsigned_integer = 255;
 #  lsimple.character = 'a';
 
-send_gdb "-exec-step 9\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"119\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+mi_execute_to "exec-step 9" "end-stepping-range" "do_locals_tests" "" \
+       "var-cmd.c" [expr $line_dlt_linteger + 12] "" "step at do_locals_tests (5)"
 
 # Test: c_variable-2.6
 # Desc: check whether llong, lplong, lfloat, lpfloat, ldouble, lpdouble, lsimple.integer,
 #       lsimple.unsigned_character lsimple.integer lsimple.character changed
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\",name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\",name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\",name=\"lpdouble\",in_scope=\"true\",type_changed=\"false\",name=\"ldouble\",in_scope=\"true\",type_changed=\"false\",name=\"lpfloat\",in_scope=\"true\",type_changed=\"false\",name=\"lfloat\",in_scope=\"true\",type_changed=\"false\",name=\"lplong\",in_scope=\"true\",type_changed=\"false\",name=\"llong\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lpdouble\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"ldouble\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lpfloat\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lfloat\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lplong\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"llong\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: many changed"
 
 # Step over:
@@ -281,20 +210,15 @@ mi_gdb_test "-var-update *" \
 #  lpsimple = &lsimple;
 #  func = nothing;
 
-send_gdb "-exec-step 4\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"125\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+set line_dlt_4321 [gdb_get_line_number "linteger = 4321;"]
+
+mi_execute_to "exec-step 4" "end-stepping-range" "do_locals_tests" "" \
+       "var-cmd.c" $line_dlt_4321 "" "step at do_locals_tests (6)"
 
 # Test: c_variable-2.7
 # Desc: check whether (lsimple.signed_character, lsimple.char_ptr) lpsimple, func changed
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"func\",in_scope=\"true\",type_changed=\"false\",name=\"lpsimple\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"func\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lpsimple\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: func and lpsimple changed"
 
 # Step over
@@ -307,15 +231,8 @@ mi_gdb_test "-var-update *" \
 #  lsimple.unsigned_integer = 4321;
 #  lsimple.character = 'b';
 
-send_gdb "-exec-step 8\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"133\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at do_locals_tests"
-    }
-    timeout {
-       fail "step at do_locals_tests (timeout)"
-    }
-}
+mi_execute_to "exec-step 8" "end-stepping-range" "do_locals_tests" "" \
+       "var-cmd.c" [expr $line_dlt_4321 + 8] "" "step at do_locals_tests (7)"
 
 # Test: c_variable-2.8
 # Desc: check whether linteger, lcharacter, llong, lfoat, ldouble, lsimple.integer,
@@ -323,8 +240,8 @@ gdb_expect {
 # Note: this test also checks that lpsimple->integer and lsimple.integer have
 #       changed (they are the same)
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\",name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\",name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\",name=\"ldouble\",in_scope=\"true\",type_changed=\"false\",name=\"lfloat\",in_scope=\"true\",type_changed=\"false\",name=\"llong\",in_scope=\"true\",type_changed=\"false\",name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\",name=\"linteger\",in_scope=\"true\",type_changed=\"false\"\}" \
-       "update all vars: func and lpsimple changed"
+       "\\^done,changelist=\\\[\{name=\"lsimple.integer\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lsimple->integer\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lsimple.character\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"ldouble\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lfloat\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"llong\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lpcharacter\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"lcharacter\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\},\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
+       "update all vars: lsimple and others changed"
 
 
 ### 
@@ -333,12 +250,29 @@ mi_gdb_test "-var-update *" \
 #
 ###
 mi_gdb_test "-var-assign global_simple 0" \
-       "&\"mi_cmd_var_assign: Variable object is not editable\\\\n\".*\\^error,msg=\"mi_cmd_var_assign: Variable object is not editable\"" \
+       "\\^error,msg=\"-var-assign: Variable object is not editable\"" \
        "assign to global_simple"
 
 mi_gdb_test "-var-assign linteger 3333" \
        "\\^done,value=\"3333\"" \
-       "assign to linteger"
+       "assign to linteger, 1st"
+
+# Allow lpcharacter to update, optionally.  Because it points to a
+# char variable instead of a zero-terminated string, if linteger is
+# directly after it in memory the printed characters may appear to
+# change.
+set lpchar_update "\{name=\"lpcharacter\",in_scope=\"true\",type_changed=\"false\"\},"
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[($lpchar_update)?\{name=\"linteger\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
+       "update all vars: linteger changed after assign"
+
+mi_gdb_test "-var-assign linteger 3333" \
+       "\\^done,value=\"3333\"" \
+       "assign to linteger again, same value"
+
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\\\]" \
+       "update all vars: linteger not changed after same assign"
 
 mi_gdb_test "-var-evaluate-expression linteger" \
        "\\^done,value=\"3333\"" \
@@ -346,7 +280,15 @@ mi_gdb_test "-var-evaluate-expression linteger" \
 
 mi_gdb_test "-var-assign lpinteger \"&linteger + 3\"" \
        "\\^done,value=\"$hex\"" \
-       "assign to lpinteger"
+       "assign to lpinteger, 1st"
+
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\{name=\"lpinteger\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
+       "update all vars: lpinteger changed after assign"
+
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\\\]" \
+       "update all vars: no changes on second update"
 
 mi_gdb_test "-var-evaluate-expression lpinteger" \
        "\\^done,value=\"$hex\"" \
@@ -356,11 +298,11 @@ mi_gdb_test "-var-evaluate-expression lpinteger" \
 
 mi_gdb_test "-var-assign linteger 4321" \
        "\\^done,value=\"4321\"" \
-       "assign to linteger"
+       "assign to linteger, 2nd"
 
 mi_gdb_test "-var-assign lpinteger &linteger" \
        "\\^done,value=\"$hex\"" \
-       "assign to lpinteger"
+       "assign to lpinteger, 2nd"
 
 mi_gdb_test "-var-assign lcharacter 'z'" \
        "\\^done,value=\"122 'z'\"" \
@@ -372,33 +314,33 @@ mi_gdb_test "-var-evaluate-expression lcharacter" \
 
 mi_gdb_test "-var-assign llong 1313L" \
        "\\^done,value=\"1313\"" \
-       "assign to llong"
+       "assign to llong, 1st"
 mi_gdb_test "-var-evaluate-expression llong" \
        "\\^done,value=\"1313\"" \
        "eval llong"
 mi_gdb_test "-var-assign llong 1212L" \
        "\\^done,value=\"1212\"" \
-       "assign to llong"
+       "assign to llong, 2nd"
 
 mi_gdb_test "-var-assign lplong &llong+4" \
        "\\^done,value=\"$hex\"" \
-       "assign to lplong"
+       "assign to lplong, 1st"
 mi_gdb_test "-var-evaluate-expression lplong" \
        "\\^done,value=\"$hex\"" \
        "eval lplong"
 mi_gdb_test "-var-assign lplong &llong" \
        "\\^done,value=\"$hex\"" \
-       "assign to lplong"
+       "assign to lplong, 2nd"
 
-mi_gdb_test "-var-assign lfloat 3.4" \
-       "\\^done,value=\"3.4.*\"" \
-       "assign to lfloat"
+mi_gdb_test "-var-assign lfloat 3.4567" \
+       "\\^done,value=\"3.45.*\"" \
+       "assign to lfloat, 1st"
 mi_gdb_test "-var-evaluate-expression lfloat" \
-       "\\^done,value=\"3.4.*\"" \
+       "\\^done,value=\"3.45.*\"" \
        "eval lfloat"
-mi_gdb_test "-var-assign lfloat 1.2" \
-       "\\^done,value=\"1.2.*\"" \
-       "assign to lfloat"
+mi_gdb_test "-var-assign lfloat 1.2345" \
+       "\\^done,value=\"1.23.*\"" \
+       "assign to lfloat, 2nd"
 
 mi_gdb_test "-var-assign lpfloat &lfloat+4" \
        "\\^done,value=\"$hex\"" \
@@ -424,48 +366,65 @@ mi_gdb_test "-var-assign lsimple.integer 333" \
        "\\^done,value=\"333\"" \
        "assign to lsimple.integer"
 
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=.*" \
+       "var update"
+
+# Check that assignment of function and array values
+# promotes the assigned value to function pointer/data
+# pointer before comparing with the existing value, 
+# and does not incorrectly make the value as changed.
+mi_gdb_test "-var-assign func do_block_tests" \
+       "\\^done,value=\"$hex <do_block_tests>\"" \
+       "assign same value to func"
+
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\\\]" \
+       "assign same value to func (update)"
+
+mi_gdb_test "-var-create array_ptr * array_ptr" \
+       "\\^done,name=\"array_ptr\",numchild=\"1\",value=\"$hex <array>\",type=\"int \\*\",has_more=\"0\"" \
+       "create global variable array_ptr"
+
+mi_gdb_test "-var-assign array_ptr array2" \
+       "\\^done,value=\"$hex <array2>\"" \
+       "assign array to pointer"
+
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\{name=\"array_ptr\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
+       "assign array to pointer (update)"
+
+mi_gdb_test "-var-assign array_ptr array2" \
+       "\\^done,value=\"$hex <array2>\"" \
+       "assign same array to pointer"
+
+mi_gdb_test "-var-update *" \
+       "\\^done,changelist=\\\[\\\]" \
+       "assign same array to pointer (update)"
+
+
 ######
 # End of assign tests 
 #####
 
-mi_gdb_test "-break-insert subroutine1" \
-       "\\^done,bkpt=\{number=\"2\",type=\"breakpoint\",disp=\"keep\",enabled=\"y\",addr=\"$hex\",func=\"subroutine1\",file=\".*var-cmd.c\",line=\"146\",times=\"0\"\}" \
-       "break-insert subroutine1"
-send_gdb "-exec-continue\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"breakpoint-hit\",bkptno=\"2\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\"4321\"\},\{name=\"l\",value=\"$hex\"\}\},file=\".*var-cmd.c\",line=\"146\"\}\r\n$mi_gdb_prompt$" {
-       pass "continue to subroutine1"
-    }
-    timeout {
-       fail "continue to subroutine1 (timeout)"
-    }
-}
+set line_subroutine1_body [gdb_get_line_number "global_simple.integer = i + 3;"]
+
+mi_continue_to subroutine1
 
 # Test: c_variable-2.10
 # Desc: create variable for locals i,l in subroutine1
-mi_gdb_test "-var-create i  * i" \
-       "\\^done,name=\"i\",numchild=\"0\",type=\"int\"" \
-       "create i"
+mi_create_varobj_checked i i int "create i"
 
-mi_gdb_test "-var-create l * l" \
-       "\\^done,name=\"l\",numchild=\"1\",type=\"long int \\*\"" \
-       "create l"
+mi_create_varobj_checked l l {long \*} "create l"
 
 # Test: c_variable-2.11
 # Desc: create do_locals_tests local in subroutine1
 mi_gdb_test "-var-create linteger * linteger" \
-       "&\"mi_cmd_var_create: unable to create variable object\\\\n\".*\\^error,msg=\"mi_cmd_var_create: unable to create variable object\"" \
+       "\\^error,msg=\"-var-create: unable to create variable object\"" \
        "create linteger"
 
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\},file=\".*var-cmd.c\",line=\"147\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at subroutine1"
-    }
-    timeout {
-       fail "step at subroutine1 (timeout)"
-    }
-}
+mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
+       "var-cmd.c" [expr $line_subroutine1_body + 1] "step at subroutine1"
 
 # Test: c_variable-2.12
 # Desc: change global_simple.integer
@@ -480,46 +439,32 @@ mi_gdb_test "-var-update *" \
        "update all vars: changed FIXME"
 clear_xfail *-*-*
 
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\},file=\".*var-cmd.c\",line=\"148\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at subroutine1"
-    }
-    timeout { fail "step at subroutine1 (timeout)" }
-}
+mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
+       "var-cmd.c" [expr $line_subroutine1_body + 2] "step at subroutine1 (2)"
 
 # Test: c_variable-2.13
 # Desc: change subroutine1 local i
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"i\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"i\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: i changed"
 
-send_gdb "-exec-step\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"subroutine1\",args=\{\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}\},file=\".*var-cmd.c\",line=\"149\"\}\r\n$mi_gdb_prompt$" {
-       pass "step at subroutine1"
-    }
-    timeout { fail "step at subroutine1 (timeout)" }
-}
+mi_step_to "subroutine1" "\{name=\"i\",value=\".*\"\},\{name=\"l\",value=\".*\"\}" \
+       "var-cmd.c" [expr $line_subroutine1_body + 3] "step at subroutine1 (3)"
 
 # Test: c_variable-2.14
 # Desc: change do_locals_tests local llong
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"llong\",in_scope=\"true\",type_changed=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"llong\",in_scope=\"true\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: llong changed"
 
-send_gdb "-exec-next\n"
-gdb_expect {
-    -re "\\^running\r\n${mi_gdb_prompt}\\*stopped,reason=\"end-stepping-range\",thread-id=\"0\",frame=\{addr=\"$hex\",func=\"do_locals_tests\",args=\{\},file=\".*var-cmd.c\",line=\"136\"\}\r\n$mi_gdb_prompt$" {
-       pass "next out of subroutine1"
-    }
-    timeout { fail "next out of subroutine1 (timeout)" }
-}
+set line_dlt_call_subroutine1 [gdb_get_line_number "subroutine1 (linteger, &llong);"]
+mi_next_to "do_locals_tests" ""        "var-cmd.c" \
+  [expr $line_dlt_call_subroutine1 + 1] "next out of subroutine1"
 
 # Test: c_variable-2.15
 # Desc: check for out of scope subroutine1 locals
 mi_gdb_test "-var-update *" \
-       "\\^done,changelist=\{name=\"l\",in_scope=\"false\",name=\"i\",in_scope=\"false\"\}" \
+       "\\^done,changelist=\\\[\{name=\"l\",in_scope=\"false\"\,type_changed=\"false\",has_more=\"0\"},\{name=\"i\",in_scope=\"false\",type_changed=\"false\",has_more=\"0\"\}\\\]" \
        "update all vars: all now out of scope"
 
 # Done with locals/globals tests. Erase all variables
@@ -600,10 +545,137 @@ mi_gdb_test "-var-delete l" \
        "\\^done,ndeleted=\"1\"" \
        "delete var l"
 
-mi_gdb_exit
-return 0
+# Test whether we can follow the name of a variable through multiple
+# stack frames.
+mi_continue_to do_special_tests
 
-# Local variables: 
-# change-log-default-name: "ChangeLog-mi"
-# End:
+mi_gdb_test "-var-create selected_a @ a" \
+  {\^done,name="selected_a",numchild="0",value=\".*\",type="int".*} \
+  "create selected_a"
 
+mi_continue_to incr_a
+
+mi_gdb_test "-var-update selected_a" \
+       "\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",type_changed=\"true\",new_type=\"char\",new_num_children=\"0\",has_more=\"0\"\}\\\]" \
+       "update selected_a in incr_a"
+
+mi_next "step a line in incr_a"
+mi_next "return from incr_a to do_special_tests"
+
+mi_gdb_test "-var-update selected_a" \
+       "\\^done,changelist=\\\[\{name=\"selected_a\",in_scope=\"true\",type_changed=\"true\",new_type=\"int\",new_num_children=\"0\",has_more=\"0\"\}\\\]" \
+       "update selected_a in do_special_tests"
+
+if [is_remote host] {
+    set filename ${testfile}
+} else {
+    set filename ${binfile}
+}
+
+mi_gdb_test "-file-exec-and-symbols ${filename}" "\\^done" \
+    "floating varobj invalidation"
+
+mi_delete_varobj selected_a "delete selected_a"
+mi_delete_varobj array_ptr "delete array_ptr"
+
+proc set_frozen {varobjs flag} {
+    foreach v $varobjs {
+        mi_gdb_test "-var-set-frozen $v $flag" \
+            "\\^done" \
+            "-var-set-frozen $v $flag"
+    }
+}
+
+mi_prepare_inline_tests $srcfile
+mi_run_inline_test frozen
+
+mi_run_inline_test bitfield
+
+# Since the inline test framework does not really work with
+# function calls, first to inline tests and then do the reminder
+# manually.
+mi_run_inline_test floating
+set do_at_tests_callee_breakpoint [gdb_get_line_number "breakpoint inside callee"]
+mi_gdb_test "-break-insert var-cmd.c:$do_at_tests_callee_breakpoint" ".*" \
+    "inside breakpoint inside callee"
+mi_execute_to "exec-continue" "breakpoint-hit" do_at_tests_callee "" ".*" ".*" \
+    { "" "disp=\"keep\"" } \
+    "continue to where i is initialized"
+
+mi_varobj_update F {F} "update F inside callee"
+mi_check_varobj_value F 7 "check F inside callee"
+
+# Test whether bad varobjs crash GDB.
+
+# A varobj we fail to read during -var-update should be considered
+# out of scope.
+mi_gdb_test "-var-create null_ptr * **0" \
+    {\^done,name="null_ptr",numchild="0",value=".*",type="int",has_more="0"} \
+    "create null_ptr"
+
+# Allow this to succeed, if address zero is readable, although it
+# will not test what it was meant to.  Most important is that GDB
+# does not crash.
+mi_gdb_test "-var-update null_ptr" \
+    {\^done,changelist=\[.*\]} \
+    "update null_ptr"
+
+mi_gdb_test "-var-delete null_ptr" \
+    "\\^done,ndeleted=\"1\"" \
+    "delete null_ptr"
+
+# When we fail to read a varobj created from a named variable,
+# we evaluate its type instead.  Make sure that doesn't blow
+# up by trying to read it again.  We can use _end when not running
+# the program to simulate an unreadable variable, if this platform
+# provides _end, but cope if it's missing.
+
+mi_gdb_test "kill" \
+    {&"kill\\n".*\^done} \
+    "kill program before endvar"
+
+mi_gdb_test "-var-create endvar * _end" \
+    {(\^done,name="endvar",numchild="0",value=".*",type=".*"|\^error,msg=".*")} \
+    "create endvar"
+
+# Allow this to succeed whether the value is readable, unreadable, or
+# missing.  Most important is that GDB does not crash.
+mi_gdb_test "-var-update endvar" \
+    {(\^done,changelist=\[.*\]|\^error,msg=".*not found")} \
+    "update endvar"
+
+mi_gdb_test "-var-delete endvar" \
+    {(\^done,ndeleted="1"|\^error,msg=".*not found")} \
+    "delete endvar"
+
+mi_delete_breakpoints
+
+with_test_prefix "second run" {
+  mi_runto do_locals_tests
+}
+
+mi_create_varobj "L" "lsimple" "in-and-out-of-scope: create varobj"
+mi_check_varobj_value "L" "{...}" "in-and-out-of-scope: check initial value"
+
+mi_runto main
+
+mi_gdb_test "-var-update L" \
+    {\^done,changelist=\[{name="L",in_scope="false",type_changed="false",has_more="0"}\]} \
+    "in-and-out-of-scope: out of scope now"
+
+mi_gdb_test "-var-update L" \
+    {\^done,changelist=\[]} \
+    "in-and-out-of-scope: out of scope now, not changed"
+
+mi_continue_to do_locals_tests
+
+mi_gdb_test "-var-update L" \
+    {\^done,changelist=\[{name="L",in_scope="true",type_changed="false",has_more="0"}\]} \
+    "in-and-out-of-scope: in scope now"
+
+mi_gdb_test "-var-update L" \
+    {\^done,changelist=\[\]} \
+    "in-and-out-of-scope: in scope now, not changed"
+
+mi_gdb_exit
+return 0