2003-11-27 Michael Chastain <mec.gnu@mindspring.com>

	Partial fix for PR testsuite/1456.
	* gdb.base/volatile.exp: Replace references to gcc_compiled with
	calls to test_compiler_info.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b11eacdadd53cf779fb98870c9e38a0ab1c58efa..e9759cbc6bc8513ef58aed9836697f8216ea34ae 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2003-11-27  Michael Chastain  <mec.gnu@mindspring.com>
+
+       Partial fix for PR testsuite/1456.
+       * gdb.base/volatile.exp: Replace references to gcc_compiled with
+       calls to test_compiler_info.
+
 2003-11-27  Mark Kettenis  <kettenis@gnu.org>
 
        * gdb.base/structs.exp: Use i*86-*-* instead of i686-*-* as a

diff --git a/gdb/testsuite/gdb.base/volatile.exp b/gdb/testsuite/gdb.base/volatile.exp
index 704369605eba452f2e683e7bd29aa96507393857..faf62b9847b844261f1656d7276009de729279ad 100644 (file)
--- a/gdb/testsuite/gdb.base/volatile.exp
+++ b/gdb/testsuite/gdb.base/volatile.exp
@@ -88,9 +88,7 @@ if ![runto_main] then {
 get_debug_format
 
 proc local_compiler_xfail_check { } {
-    global gcc_compiled;
-
-    if {$gcc_compiled == 2} then {
+    if { [test_compiler_info gcc-2-*] } then {
        if { ![test_debug_format "HP"] \
                && ![test_debug_format "DWARF 2"] } then {
            setup_xfail "*-*-*" 
@@ -258,7 +256,7 @@ gdb_test "ptype vendor" "type = const volatile unsigned char \\* const volatile.
 
 # test function parameters
 local_compiler_xfail_check
-if {$gcc_compiled == 3 && [test_debug_format "stabs"]} then {
+if { [test_compiler_info gcc-3-*] && [test_debug_format "stabs"] } then {
     # For reasons unknown, GCC 3 with stabs mangles several cv-qualified
     # arguments to this function.
     setup_xfail "*-*-*"