import gdb-1999-06-28 snapshot

1 files changed, 53 insertions, 26 deletions

diff --git a/gdb/testsuite/gdb.base/whatis.exp b/gdb/testsuite/gdb.base/whatis.exp
index 1f4e8b3..d540e4c 100644
--- a/gdb/testsuite/gdb.base/whatis.exp
+++ b/gdb/testsuite/gdb.base/whatis.exp
@@ -49,14 +49,6 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load $binfile
 
-# If we did not use the signed keyword when compiling the file, don't
-# expect GDB to know that char is signed.
-if $signed_keyword_not_used then {
-    set signed_char "char"
-} else {
-    set signed_char "signed char"
-}
-
 # Define a procedure to set up an xfail for all targets that put out a
 # `long' type as an `int' type.
 # Sun/Ultrix cc have this problem.
@@ -77,10 +69,21 @@ proc setup_xfail_on_long_vs_int {} {
 # uses in the stabs.  So we need to deal with names both from gcc and
 # native compilers.
 #
+
 gdb_test "whatis v_char" \
     "type = (unsigned char|char)" \
     "whatis char"
 
+# If we did not use the signed keyword when compiling the file, don't
+# expect GDB to know that char is signed.
+if { $hp_cc_compiler || $hp_aCC_compiler } {
+    set signed_keyword_not_used 1
+}
+if $signed_keyword_not_used then {
+    set signed_char "char"
+} else {
+    set signed_char "signed char"
+}
 setup_xfail "a29k-*-*"
 if {!$gcc_compiled} then { setup_xfail "mips-sgi-irix*" }
 gdb_test "whatis v_signed_char" \
@@ -270,13 +273,21 @@ gdb_test "whatis v_double_pointer" \
     "whatis double pointer"
 
 
+if { $hp_aCC_compiler } {
+    set unstruct "unnamed\.struct\..*"
+    set ununion "unnamed\.union\..*"
+} else {
+    set unstruct "\.\.\."
+    set ununion "\.\.\."
+}
+
 # test whatis command with structure types
 gdb_test "whatis v_struct1" \
     "type = struct t_struct" \
     "whatis named structure"
 
 gdb_test "whatis v_struct2" \
-    "type = struct \{...\}" \
+    "type = struct \{$unstruct\}" \
     "whatis unnamed structure"
 
 
@@ -286,68 +297,78 @@ gdb_test "whatis v_union" \
     "whatis named union"
 
 gdb_test "whatis v_union2" \
-    "type = union \{...\}" \
+    "type = union \{$ununion\}" \
     "whatis unnamed union"
 
 
+if { [istarget "hppa*-hp-hpux10.20"] && $hp_aCC_compiler } {
+    # On HP-UX 10.20 with aCC compiler and objdebug mode,
+    # we need the 'void' pattern; without objdebug mode,
+    # we still need to '' pattern.
+    # FIXME: need to look into this further.
+    # - guo
+    set void "(void|)"
+} else {
+    set void ""
+}
 
 # test whatis command with functions return type
 gdb_test "whatis v_char_func" \
-    "type = (signed |unsigned |)char \\(\\)" \
+    "type = (signed |unsigned |)char \\($void\\)" \
     "whatis char function"
 
 gdb_test "whatis v_signed_char_func" \
-    "type = (signed |unsigned |)char \\(\\)" \
+    "type = (signed |unsigned |)char \\($void\\)" \
     "whatis signed char function"
 
 gdb_test "whatis v_unsigned_char_func" \
-    "type = unsigned char \\(\\)"	\
+    "type = unsigned char \\($void\\)"	\
     "whatis unsigned char function"
 
 gdb_test "whatis v_short_func" \
-    "type = short (int |)\\(\\)" \
+    "type = short (int |)\\($void\\)" \
     "whatis short function"
 
 gdb_test "whatis v_signed_short_func" \
-    "type = (signed |)short (int |)\\(\\)" \
+    "type = (signed |)short (int |)\\($void\\)" \
     "whatis signed short function"
 
 gdb_test "whatis v_unsigned_short_func" \
-    "type = (unsigned short|short unsigned int) \\(\\)" \
+    "type = (unsigned short|short unsigned int) \\($void\\)" \
     "whatis unsigned short function"
 
 gdb_test "whatis v_int_func" \
-    "type = int \\(\\)" \
+    "type = int \\($void\\)" \
     "whatis int function"
 
 gdb_test "whatis v_signed_int_func" \
-    "type = (signed |)int \\(\\)" \
+    "type = (signed |)int \\($void\\)" \
     "whatis signed int function"
 
 gdb_test "whatis v_unsigned_int_func" \
-    "type = unsigned int \\(\\)" \
+    "type = unsigned int \\($void\\)" \
     "whatis unsigned int function"
 
 gdb_test "whatis v_long_func" \
-    "type = (long|int|long int) \\(\\)" \
+    "type = (long|int|long int) \\($void\\)" \
     "whatis long function"
 
 gdb_test "whatis v_signed_long_func" \
-    "type = (signed |)(int|long|long int) \\(\\)" \
+    "type = (signed |)(int|long|long int) \\($void\\)" \
     "whatis signed long function"
 
 gdb_test "whatis v_unsigned_long_func" \
-    "type = (unsigned (int|long|long int)|long unsigned int) \\(\\)" \
+    "type = (unsigned (int|long|long int)|long unsigned int) \\($void\\)" \
     "whatis unsigned long function"
 
 # Sun /bin/cc calls this a function returning double.
 if {!$gcc_compiled} then {setup_xfail "*-sun-sunos4*"}
 gdb_test "whatis v_float_func" \
-    "type = float \\(\\)" \
+    "type = float \\($void\\)" \
     "whatis float function"
 
 gdb_test "whatis v_double_func" \
-    "type = double \\(\\)" \
+    "type = double \\($void\\)" \
     "whatis double function" \
 
 
@@ -376,8 +397,14 @@ gdb_test "whatis nested_su.outer_int" \
     "type = int" \
     "whatis outer structure member"
 
+if {$hp_aCC_compiler} {
+    set outer "outer_struct::"
+} else {
+    set outer ""
+}
+
 gdb_test "whatis nested_su.inner_struct_instance" \
-    "type = struct inner_struct" \
+    "type = struct ${outer}inner_struct" \
     "whatis inner structure"
 
 gdb_test "whatis nested_su.inner_struct_instance.inner_int" \
@@ -385,7 +412,7 @@ gdb_test "whatis nested_su.inner_struct_instance.inner_int" \
     "whatis inner structure member"
 
 gdb_test "whatis nested_su.inner_union_instance" \
-    "type = union inner_union" \
+    "type = union ${outer}inner_union" \
     "whatis inner union"
 
 gdb_test "whatis nested_su.inner_union_instance.inner_union_int" \