* gdb.base/completion.exp: Recognize the more detailed error

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

diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index 0bff1e763d0af83b18b14734cd67562fd4d9ac7b..efb271b6ec025b61e6afca35f1ecdd1d6d616504 100644 (file)
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -49,7 +49,13 @@ set testfile "constvars"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
-if [istarget "hppa*-*-*"] {
+# Create and source the file that provides information about the compiler
+# used to compile the test case.
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+
+if {$hp_aCC_compiler || $hp_cc_compiler} {
     set lang "c++"
 } else {
     set lang ""
@@ -79,6 +85,19 @@ if ![runto_main] then {
     continue
 }
 
+get_debug_format
+
+proc local_compiler_xfail_check { } {
+    global gcc_compiled;
+
+    if {$gcc_compiled} then {
+       if { ![test_debug_format "HP"] \
+               && ![test_debug_format "DWARF 2"] } then {
+           setup_xfail "*-*-*" 
+       }
+    }
+}
+
 send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
 
     send_gdb "cont\n"
@@ -105,143 +124,143 @@ send_gdb "break marker1\n" ; gdb_expect -re ".*$gdb_prompt $"
 # As of Feb 1999, GCC does not issue info about volatility of vars, so
 # these tests are all expected to fail if GCC is the compiler. -sts
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vox" "type = volatile char.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype victuals" "type = volatile unsigned char.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vixen" "type = volatile short.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vitriol" "type = volatile unsigned short.*"
+local_compiler_xfail_check
+gdb_test "ptype vitriol" "type = volatile (unsigned short|short unsigned)( int)?.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vellum" "type = volatile long.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype valve" "type = volatile unsigned long.*"
+local_compiler_xfail_check
+gdb_test "ptype valve" "type = volatile (unsigned long|long unsigned)( int)?.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vacuity" "type = volatile float.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vertigo" "type = volatile double.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vampire" "type = volatile char \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype viper" "type = volatile unsigned char \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vigour" "type = volatile short \\*.*"
+local_compiler_xfail_check
+gdb_test "ptype vigour" "type = volatile short( int)? \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vapour" "type = volatile unsigned short \\*.*"
+local_compiler_xfail_check
+gdb_test "ptype vapour" "type = volatile (unsigned short|short unsigned)( int)? \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype ventricle" "type = volatile long \\*.*"
+local_compiler_xfail_check
+gdb_test "ptype ventricle" "type = volatile long( int)? \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vigintillion" "type = volatile unsigned long \\*.*"
+local_compiler_xfail_check
+gdb_test "ptype vigintillion" "type = volatile (unsigned long|long unsigned)( int)? \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vocation" "type = volatile float \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype veracity" "type = volatile double \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vapidity" "type = volatile char \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype velocity" "type = volatile unsigned char \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype veneer" "type = volatile short \\* volatile.*"
+local_compiler_xfail_check
+gdb_test "ptype veneer" "type = volatile short( int)? \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype video" "type = volatile unsigned short \\* volatile.*"
+local_compiler_xfail_check
+gdb_test "ptype video" "type = volatile (unsigned short|short unsigned)( int) \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype vacuum" "type = volatile long \\* volatile.*"
+local_compiler_xfail_check
+gdb_test "ptype vacuum" "type = volatile long( int)? \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
-gdb_test "ptype veniality" "type = volatile unsigned long \\* volatile.*"
+local_compiler_xfail_check
+gdb_test "ptype veniality" "type = volatile (unsigned long|long unsigned)( int)? \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vitality" "type = volatile float \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype voracity" "type = volatile double \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype victor" "type = const volatile char.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vicar" "type = const volatile unsigned char.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype victory" "type = const volatile char \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vicarage" "type = const volatile unsigned char \\*.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vein" "type = volatile char \\* const.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vogue" "type = volatile unsigned char \\* const.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype cavern" "type = const volatile char \\* const.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype coverlet" "type = const volatile unsigned char \\* const.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype caveat" "type = const char \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype covenant" "type = const unsigned char \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vizier" "type = const volatile char \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vanadium" "type = const volatile unsigned char \\* volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vane" "type = char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype veldt" "type = unsigned char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype cove" "type = const char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype cavity" "type = const unsigned char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vagus" "type = volatile char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vagrancy" "type = volatile unsigned char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vagary" "type = const volatile char \\* const volatile.*"
 
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 gdb_test "ptype vendor" "type = const volatile unsigned char \\* const volatile.*"
 
 # test function parameters
-if {$gcc_compiled} then { setup_xfail "*-*-*" }
+local_compiler_xfail_check
 send_gdb "ptype qux2\n"
 gdb_expect {
-    -re "type = int \\(volatile unsigned char, const volatile int, volatile short, volatile long \\*, float \\* volatile, const volatile signed char \\* const volatile\\).*$gdb_prompt $" {
+    -re "type = int \\(volatile unsigned char, const volatile int, volatile short( int)?, volatile long( int)? \\*, float \\* volatile, const volatile signed char \\* const volatile\\).*$gdb_prompt $" {
         pass "ptype qux2"
     }
     -re ".*$gdb_prompt $" { fail "ptype qux2" }