Fix more cases of improper test names

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.base / display.exp

diff --git a/gdb/testsuite/gdb.base/display.exp b/gdb/testsuite/gdb.base/display.exp
index 6e21d9ee0090f4998d32c78fbcc39b0f159d22bc..d1bcb8f05848fcb46f5c61ecd79a527701283f8b 100644 (file)
--- a/gdb/testsuite/gdb.base/display.exp
+++ b/gdb/testsuite/gdb.base/display.exp
@@ -1,4 +1,4 @@
-#   Copyright 1997-2015 Free Software Foundation, Inc.
+#   Copyright 1997-2016 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
@@ -18,9 +18,8 @@
 #
 standard_testfile
 
-if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+if {[prepare_for_testing "failed to prepare" $testfile $srcfile \
         {debug nowarnings}]} {
-    untested display.exp
     return -1
 }
 
@@ -53,7 +52,7 @@ if !$use_gdb_stub {
 # Ok, on to real life
 #
 if ![runto_main] then {
-    fail "Could not run to main - other tests will fail."
+    fail "could not run to main - other tests will fail."
     continue
 }
 
@@ -83,8 +82,23 @@ gdb_test "disp/s &sum" ".*5: x/s &sum  $hex.*sum.:.*" "display/s &sum"
 
 # Hit the displays
 #
-gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f f = 3.1415\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0\r\n\[1-9\]*: i = 0.*" "first disp"
-gdb_test "cont" ".*\[Ww\]atchpoint 3: sum.*\[1-9\]*: x/s &sum.*\[1-9\]*: /f f = 4.1415\r\n\[1-9\]*: x/i &k.*\r\n\[1-9\]*: /x j = 0x0.*\[1-9\]*: i = 0.*" "second disp"
+gdb_test "cont" [multi_line \
+                    ".*\[Ww\]atchpoint 3: sum.*" \
+                    "\[1-9\]*: i = 0.*" \
+                    "\[1-9\]*: /x j = 0x0" \
+                    "\[1-9\]*: x/i &k.*" \
+                    "\[1-9\]*: /f f = 3.1415" \
+                    "\[1-9\]*: x/s &sum.*" \
+                   ] "first disp"
+
+gdb_test "cont" [multi_line \
+                    ".*\[Ww\]atchpoint 3: sum.*" \
+                    "\[1-9\]*: i = 0.*" \
+                    "\[1-9\]*: /x j = 0x0.*" \
+                    "\[1-9\]*: x/i &k.*" \
+                    "\[1-9\]*: /f f = 4.1415" \
+                    "\[1-9\]*: x/s &sum.*" \
+                   ] "second disp"
 
 gdb_test "enab  disp 6" ".*No display number 6..*" "catch err"
 gdb_test_no_output "disab disp 1" "disab disp 1"
@@ -92,9 +106,19 @@ gdb_test_no_output "disab disp 2" "disab disp 2"
 gdb_test_no_output "enab disp 1"  "re-enab"
 gdb_test_no_output "enab disp 1"  "re-enab of enab"
 gdb_test_no_output "undisp 5"     "undisp"
-gdb_test "info disp"    ".*Auto-display expressions now in effect.*y  /f f.*y  /1bi &k.*n  /x j.*y  i.*" "info disp"
-
-gdb_test "cont" ".*\[Ww\]atch.*5.1415.*.*i = 0.*" "next hit"
+gdb_test "info disp" [multi_line \
+                         "Auto-display expressions now in effect.*" \
+                         ".*y  i" \
+                         ".*n  /x j" \
+                         ".*y  /1bi &k" \
+                         ".*y  /f f" \
+                        ] "info disp"
+
+gdb_test "cont" [multi_line \
+                    ".*\[Ww\]atch.*" \
+                    ".*i = 0" \
+                    ".*5.1415" \
+                   ] "next hit"
 
 gdb_test "undisp" \
     "" \
@@ -169,15 +193,8 @@ gdb_test "print/r j" " = 0x0\[\\r\\n\]+" "debug test output 2a"
 gdb_test "print j"   " = 0\[\\r\\n\]+"   "debug test output 3"
 
 # x/0 j doesn't produce any output and terminates PA64 process when testing
-if [istarget "hppa2.0w-hp-hpux11*"] {
-    xfail "'x/0 j' terminates PA64 process - skipped test point"
-} else {
-    gdb_test_no_output "x/0 j"
-}
-if [istarget "hppa*-hp-hpux*"] {
-    # on HP-UX you could access the first page without getting an error
-    gdb_test "x/rx j" ".*(Cannot access|Error accessing) memory.*|.*0xa:\[ \t\]*\[0-9\]+.*"
-}
+gdb_test_no_output "x/0 j"
+
 gdb_test "print/0 j" ".*Item count other than 1 is meaningless.*" "print/0 j"
 gdb_test "print/s sum" " = 1000" "ignored s"
 gdb_test "print/i sum" ".*Format letter.*is meaningless.*.*" "no i"