Update copyright year range in all GDB files

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

diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 5d153fd36160d45f039be5a5f4f97e685864fe8f..fe0826d480d3a4f67de22d236a76ca683a9c610b 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -1,5 +1,4 @@
-# Copyright 1999, 2000, 2001, 2002, 2004, 2005, 2007, 2008, 2009, 2010, 2011
-# Free Software Foundation, Inc.
+# Copyright 1999-2021 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
@@ -28,11 +27,10 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-var-cmd
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
-    untested mi-var-cmd.exp
+standard_testfile var-cmd.c
+
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+    untested "failed to compile"
     return -1
 }
 
@@ -52,6 +50,12 @@ mi_gdb_load ${binfile}
 
 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
 
@@ -66,7 +70,9 @@ mi_gdb_test "113-var-create argc * argc" \
        "113\\^error,msg=\"-var-create: unable to create variable object\"" \
        "create out of scope variable"
 
-mi_runto do_locals_tests
+with_test_prefix "first run" {
+  mi_runto do_locals_tests
+}
 
 set line_dlt_first_real [gdb_get_line_number "linteger = 1234;"]
 
@@ -84,9 +90,9 @@ mi_create_varobj_checked lcharacter lcharacter\[0\] char "create local variable
 
 mi_create_varobj_checked lpcharacter lpcharacter {char \*} "create local variable lpcharacter"
 
-mi_create_varobj_checked llong llong "long int" "create local variable llong"
+mi_create_varobj_checked llong llong "long" "create local variable llong"
 
-mi_create_varobj_checked lplong lplong {long int \*} "create local variable lplong"
+mi_create_varobj_checked lplong lplong {long \*} "create local variable lplong"
 
 mi_create_varobj_checked lfloat lfloat float "create local variable lfloat"
 
@@ -249,7 +255,7 @@ mi_gdb_test "-var-assign global_simple 0" \
 
 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
@@ -274,7 +280,7 @@ 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\"\}\\\]" \
@@ -292,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'\"" \
@@ -308,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.4567" \
        "\\^done,value=\"3.45.*\"" \
-       "assign to lfloat"
+       "assign to lfloat, 1st"
 mi_gdb_test "-var-evaluate-expression lfloat" \
        "\\^done,value=\"3.45.*\"" \
        "eval lfloat"
 mi_gdb_test "-var-assign lfloat 1.2345" \
        "\\^done,value=\"1.23.*\"" \
-       "assign to lfloat"
+       "assign to lfloat, 2nd"
 
 mi_gdb_test "-var-assign lpfloat &lfloat+4" \
        "\\^done,value=\"$hex\"" \
@@ -377,11 +383,11 @@ mi_gdb_test "-var-update *" \
        "assign same value to func (update)"
 
 mi_gdb_test "-var-create array_ptr * array_ptr" \
-       "\\^done,name=\"array_ptr\",numchild=\"1\",value=\"$hex\",type=\"int \\*\",has_more=\"0\"" \
+       "\\^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\"" \
+       "\\^done,value=\"$hex <array2>\"" \
        "assign array to pointer"
 
 mi_gdb_test "-var-update *" \
@@ -389,7 +395,7 @@ mi_gdb_test "-var-update *" \
        "assign array to pointer (update)"
 
 mi_gdb_test "-var-assign array_ptr array2" \
-       "\\^done,value=\"$hex\"" \
+       "\\^done,value=\"$hex <array2>\"" \
        "assign same array to pointer"
 
 mi_gdb_test "-var-update *" \
@@ -409,7 +415,7 @@ mi_continue_to subroutine1
 # Desc: create variable for locals i,l in subroutine1
 mi_create_varobj_checked i i int "create i"
 
-mi_create_varobj_checked l l {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
@@ -560,7 +566,13 @@ 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"
 
-mi_gdb_test "-file-exec-and-symbols ${binfile}" "\\^done" \
+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"
@@ -623,27 +635,29 @@ mi_gdb_test "kill" \
     "kill program before endvar"
 
 mi_gdb_test "-var-create endvar * _end" \
-    {(\^done,name="endvar",numchild="0",value=".*",type=".*"|&".*unable to.*".*\^error,msg=".*")} \
+    {(\^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")} \
+    {(\^done,changelist=\[.*\]|\^error,msg=".*not found")} \
     "update endvar"
 
 mi_gdb_test "-var-delete endvar" \
-    "\\^done,ndeleted=\"1\"" \
+    {(\^done,ndeleted="1"|\^error,msg=".*not found")} \
     "delete endvar"
 
 mi_delete_breakpoints
 
-mi_runto do_locals_tests
+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_runto_main
 
 mi_gdb_test "-var-update L" \
     {\^done,changelist=\[{name="L",in_scope="false",type_changed="false",has_more="0"}\]} \