From f2292c6500ee227d3fc6a630f373cf4a59940d50 Mon Sep 17 00:00:00 2001
From: Pierre Muller <muller@sourceware.org>
Date: Sat, 30 May 2009 07:58:42 +0000
Subject: 	* gdb.base/macscp.exp (info_macro): Return undefined if
 undefined. 	(check_macro): Return 1 if undefined. 	If first test fails,
 check if macro debug information is available, 	and report unsupported
 test if no macro information is found.

---
 gdb/testsuite/gdb.base/macscp.exp | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'gdb/testsuite/gdb.base/macscp.exp')

diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 351c0ec..55c4d31 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -155,7 +155,7 @@ proc info_macro {macro} {
     switch -exact -- $definition {
         no-macro-info { return no-macro-info }
         timeout { return timeout }
-        undefined -
+        undefined { return undefined }
         default {
             if {[llength $location] >= 1} {
                 return [concat $location [list $definition]]
@@ -181,6 +181,10 @@ proc check_macro {macro expected where} {
                 xfail "executable includes no macro debugging information"
                 return 1
             }
+	    undefined {
+		fail "info macro $macro $where (undefined)"
+		return 1
+	    }
             timeout {
                 fail "info macro $macro $where (timeout)"
             }
@@ -202,8 +206,28 @@ proc list_and_check_macro {func macro expected} {
 
 
 if {[list_and_check_macro main WHERE {macscp1.c {before macscp1_3}}]} {
-    return 0
+    global verbose
+    set macro_support "unknown"
+    send_gdb "info source\n"
+    gdb_test_multiple "info source" "Test macro information"  {
+	-re "Includes preprocessor macro info\..*$gdb_prompt $" {
+	    set macro_support 1
+	    verbose "Source has macro information"
+	}
+	-re "Does not include preprocessor macro info\..*$gdb_prompt $" {
+	    set macro_support 0
+	    verbose "Source has no macro information"
+	}
+	default {
+	    warning "couldn't check macro support (no valid response)."
+	}
+    }
+    if {$macro_support == 0} {
+	unsupported "Skipping test because debug information does not include macro information."
+	return 0
+    }
 }
+ 
 list_and_check_macro macscp2_2 WHERE {macscp2.h macscp1.c {before macscp2_2}}
 list_and_check_macro macscp3_2 WHERE {macscp3.h macscp1.c {before macscp3_2}}
 
-- 
cgit v1.1