* Move test with enums and partial symbols back to

	gdb.t03/{ptype.exp,gdbme.c} from gdb.stabs/{weird.def,weird.exp}.
	Reverts the change of 26 May 93.  Per today's change to
	stabs.texinfo, the behavior that weird.exp was expecting was
	unreasonable; what is important is that the compiler+gdb get
	things right, which happens with a recent gcc.  Also fix the test
	to deal with native compilers which put out the stab gdb can't
	deal with.

2 files changed, 10 insertions, 26 deletions

diff --git a/gdb/testsuite/gdb.stabs/weird.def b/gdb/testsuite/gdb.stabs/weird.def
index 92ccb9a..d558f98 100644
--- a/gdb/testsuite/gdb.stabs/weird.def
+++ b/gdb/testsuite/gdb.stabs/weird.def
@@ -276,16 +276,8 @@ attr69:
 .stabs "attr33:G333=@! !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
 .stabs "attr35:G334=@# !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
 
-.stabs "primary:G200=ered:0,green:1,blue:2,;", N_GSYM,0,0, 0
-
 .stabs "attr36:G335=@$ !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
 
-.globl primary
-.data
-.align_it
-primary:
-.long 42
-
 .stabs "attr37:G337=@% !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
 
 # Test 'e' constant on non-enum type.  
@@ -301,11 +293,10 @@ primary:
 
 .stabs "bad_neg0:G201", N_GSYM,0,0, 0
 
-# First .long is 42.  
 .globl bad_neg0
 .data
 .align_it
-ad_neg0:
+bad_neg0:
 .long 42
      .long 43, 44, 45
 
@@ -353,12 +344,13 @@ ad_neg0:
 
 .stabs "attr93:G393=@] !#$%&'()*+,-./0123456789:<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[]^_`abcdefghijklmnopqrstuvwxyz{|}~;1",N_GSYM,0,0, 0
 
-# Provide one of each, so this wins regardless of whether names have
-# underscores.  
+# Do with and without underscore, so this wins regardless of whether
+# names have underscores.
+
 .globl _common0
 .data
 .align_it
- _common0:
+_common0:
 .long 42
      .long 24
      .long 22
diff --git a/gdb/testsuite/gdb.stabs/weird.exp b/gdb/testsuite/gdb.stabs/weird.exp
index 5f46c77..d5ecc3f 100644
--- a/gdb/testsuite/gdb.stabs/weird.exp
+++ b/gdb/testsuite/gdb.stabs/weird.exp
@@ -12,13 +12,6 @@ proc do_tests {} {
 	global binfile
 	global prompt
 
-	# Do this first because the bug only exhibits itself before partial
-	# symbols have been expanded.
-	setup_xfail "*-*-*"
-	# xcoffread.c doesn't (yet) use partial symbol tables.
-	clear_xfail "rs*-*-aix*"
-	gdb_test "ptype red" "type = enum \{red, green, blue\}" "ptype unnamed enum"
-
 	# Mips/alpha targets that use gcc with mips-tfile put out the stabs
 	# assembler directives embedded in comments. If the assembler
 	# file is then processed with native cc, all stabs directives
@@ -142,8 +135,8 @@ proc do_tests {} {
 	gdb_test "ptype inttype" "type = (unsigned int|inttype)" "ptype on inttype"
 	gdb_test "p sizeof (float72type)" " = 9" "unrecognized floating point type"
 
-	gdb_test "p/x int256var" " = 0x0*2a0000002b0000002c0000002d\
-0000002d0000002c0000002b0000002a" "print very big integer"
+	# This big number needs to be kept as one piece
+	gdb_test "p/x int256var" " = 0x0*2a0000002b0000002c0000002d0000002d0000002c0000002b0000002a" "print very big integer"
 
 	gdb_test "whatis consth" "type = inttype" "whatis consth"
 	gdb_test "whatis consth2" "type = inttype" "whatis consth2"
@@ -176,7 +169,7 @@ field3 = 0x77888877\}" "print struct constant"
 	    "whatis two_var test 2"
 
 	setup_xfail "*-*-*"
-	gdb_test "whatis pointer_to_int_var" "type = int \*"
+	gdb_test "whatis pointer_to_int_var" "type = int \[*\]"
 	setup_xfail "*-*-*"
 	gdb_test "whatis intp_var" "type = intp"
 
@@ -193,9 +186,8 @@ field3 = 0x77888877\}" "print struct constant"
 	setup_xfail "*-*-*"
 	gdb_test "p common0var2" "= 22"
 
-	gdb_test "p v_comb" "{<> = \
-{<> = {x = 42}, \[_a-zA-Z$\]* = \[0-9xa-fA-F\]*, a = 43}, \
-<> = {\[_a-zA-Z$\]* = \[0-9xa-fA-F\]*, b = 44}, comb = 45}"
+	# this long line must be continous, not with "/" escaping the newline
+	gdb_test "p v_comb" "{<> = {<> = {x = 42}, \[_a-zA-Z$.\]* = \[0-9xa-fA-F\]*, a = 43}, <> = {\[_a-zA-Z$.\]* = \[0-9xa-fA-F\]*, b = 44}, comb = 45}"
 }
 
 proc print_weird_var { var } {