[PATCH]: testsuite/gdb.base/constvars.exp

[Corinna Vinschen <vinschen at redhat dot com>]

Hi,

I patched the test constvars.exp to get rid of the $gcc_compiled
compile dependencies which result in XFAIL behaviour when the
tests are compiled with GCC.  AFAICS, they aren't needed if just
the tests are more correct.

E.g., the testsuite expects strings like "unsigned long" while
gdb may also emit "long unsigned" or "long unsigned int".

The below patch cares for that.

Corinna


ChangeLog:
==========

2001-09-25  Corinna Vinschen  <vinschen@redhat.com>

	* gdb.base/constvars.exp: Eliminate $gcc_compiled dependencies.
	Check for different orders of keywords and additional "int"
	strings in output.

Index: gdb.base/constvars.exp
===================================================================
RCS file: /cvs/cvsfiles/devo/gdb/testsuite/gdb.base/constvars.exp,v
retrieving revision 1.7
diff -u -p -r1.7 constvars.exp
--- constvars.exp	2001/03/26 19:55:24	1.7
+++ constvars.exp	2001/09/25 17:23:51
@@ -107,7 +107,6 @@ send_gdb "break marker1\n" ; gdb_expect 
 
 # test function parameters
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
 send_gdb "ptype qux1\n"
 gdb_expect {
     -re "type = int \\(const char, const char, const char \\*, char \\* const\\).*$gdb_prompt $" {
@@ -129,136 +128,94 @@ proc do_constvar_tests {} {
     gdb_test "print lax" " = 20"
     gdb_test "ptype lax" "type = short.*"
     gdb_test "print lecherous" " = 30"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lecherous" "type = unsigned short.*"
+    gdb_test "ptype lecherous" "type = (unsigned short|short unsigned)( int)?"
     gdb_test "print lechery" " = 40"
     gdb_test "ptype lechery" "type = long.*"
     gdb_test "print lectern" " = 50"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lectern" "type = unsigned long.*"
+    gdb_test "ptype lectern" "type = (unsigned long|long unsigned)( int)?"
     gdb_test "print leeway" " = 60"
     gdb_test "ptype leeway" "type = float"
     gdb_test "print legacy" " = 70"
     gdb_test "ptype legacy" "type = double"
     gdb_test "print laconic" " = 65 'A'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype laconic" "type = const char"
     gdb_test "print laggard" " = 1 '.001'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype laggard" "type = const unsigned char"
     gdb_test "print lagoon" " = 2"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lagoon" "type = const short"
+    gdb_test "ptype lagoon" "type = const short( int)?"
     gdb_test "print laity" " = 3"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype laity" "type = const unsigned short"
+    gdb_test "ptype laity" "type = const (unsigned short|short unsigned)( int)?"
     gdb_test "print lambent" " = 4"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lambent" "type = const long"
+    gdb_test "ptype lambent" "type = const long( int)?"
     gdb_test "print laminated" " = 5"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype laminated" "type = const unsigned long"
+    gdb_test "ptype laminated" "type = const (unsigned long|long unsigned)( int)?"
     gdb_test "print lampoon" " = 6"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lampoon" "type = const float"
     gdb_test "print languid" " = 7"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype languid" "type = const double"
     gdb_test "print *legend" " = 66 'B'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype legend" "type = const char \\*"
     gdb_test "print *legerdemain" " = 10 '\\\\n'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype legerdemain" "type = const unsigned char \\*"
     gdb_test "print *leniency" " = 20"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype leniency" "type = const short \\*"
+    gdb_test "ptype leniency" "type = const short( int)? \\*"
     gdb_test "print *leonine" " = 30"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype leonine" "type = const unsigned short \\*"
+    gdb_test "ptype leonine" "type = const (unsigned short|short unsigned)( int)? \\*"
     gdb_test "print *lesion" " = 40"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lesion" "type = const long \\*"
+    gdb_test "ptype lesion" "type = const long( int)? \\*"
     gdb_test "print *lethal" " = 50"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lethal" "type = const unsigned long \\*"
+    gdb_test "ptype lethal" "type = const (unsigned long|long unsigned)( int)? \\*"
     gdb_test "print *lethargic" " = 60"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lethargic" "type = const float \\*"
     gdb_test "print *levity" " = 70"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype levity" "type = const double \\*"
     gdb_test "print *lewd" " = 65 'A'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lewd" "type = const char \\* const"
     gdb_test "print *lexicographer" " = 1 '.001'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lexicographer" "type = const unsigned char \\* const"
     gdb_test "print *lexicon" " = 2"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lexicon" "type = const short \\* const"
+    gdb_test "ptype lexicon" "type = const short( int)? \\* const"
     gdb_test "print *liaison" " = 3"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype liaison" "type = const unsigned short \\* const"
+    gdb_test "ptype liaison" "type = const (unsigned short|short unsigned)( int)? \\* const"
     gdb_test "print *libation" " = 4"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype libation" "type = const long \\* const"
+    gdb_test "ptype libation" "type = const long( int)? \\* const"
     gdb_test "print *libelous" " = 5"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype libelous" "type = const unsigned long \\* const"
+    gdb_test "ptype libelous" "type = const (unsigned long|long unsigned)( int)? \\* const"
     gdb_test "print *libertine" " = 6"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype libertine" "type = const float \\* const"
     gdb_test "print *libidinous" " = 7"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype libidinous" "type = const double \\* const"
     gdb_test "print *languish" " = 65 'A'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype languish" "type = const char \\*"
     gdb_test "print *languor" " = 1 '.001'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype languor" "type = const unsigned char \\*"
     gdb_test "print *lank" " = 2"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lank" "type = const short \\*"
+    gdb_test "ptype lank" "type = const short( int)? \\*"
     gdb_test "print *lapidary" " = 3"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lapidary" "type = const unsigned short \\*"
+    gdb_test "ptype lapidary" "type = const (unsigned short|short unsigned)( int)? \\*"
     gdb_test "print *larceny" " = 4"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype larceny" "type = const long \\*"
+    gdb_test "ptype larceny" "type = const long( int)? \\*"
     gdb_test "print *largess" " = 5"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype largess" "type = const unsigned long \\*"
+    gdb_test "ptype largess" "type = const (unsigned long|long unsigned)( int)? \\*"
     gdb_test "print *lascivious" " = 6"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lascivious" "type = const float \\*"
     gdb_test "print *lassitude" " = 7"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lassitude" "type = const double \\*"
     gdb_test "print *lamprey" " = 66 'B'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lamprey" "type = char \\* const"
     gdb_test "print *lariat" " = 10 '\\\\n'"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lariat" "type = unsigned char \\* const"
     gdb_test "print *laudanum" " = 20"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype laudanum" "type = short \\* const"
+    gdb_test "ptype laudanum" "type = short( int)? \\* const"
     gdb_test "print *lecithin" " = 30"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype lecithin" "type = unsigned short \\* const"
+    gdb_test "ptype lecithin" "type = (unsigned short|short unsigned)( int)? \\* const"
     gdb_test "print *leviathan" " = 40"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype leviathan" "type = long \\* const"
+    gdb_test "ptype leviathan" "type = long( int)? \\* const"
     gdb_test "print *libretto" " = 50"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
-    gdb_test "ptype libretto" "type = unsigned long \\* const"
+    gdb_test "ptype libretto" "type = (unsigned long|long unsigned)( int)? \\* const"
     gdb_test "print *lissome" " = 60"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype lissome" "type = float \\* const"
     gdb_test "print *locust" " = 70"
-    if {$gcc_compiled} then { setup_xfail "*-*-*" }
     gdb_test "ptype locust" "type = double \\* const"
 }
 

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen@redhat.com