From b67c692ff9a371eb1efe014cbadf5cd5a17acbfe Mon Sep 17 00:00:00 2001
From: Daniel Jacobowitz <drow@false.org>
Date: Thu, 12 Nov 2009 19:37:40 +0000
Subject: [PATCH] 	testsuite/ 	* gdb.base/macscp.exp: Avoid the first
 FAIL if macro information 	is missing.

---
 gdb/testsuite/ChangeLog           |  5 +++++
 gdb/testsuite/gdb.base/macscp.exp | 37 ++++++++++++++-----------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fad62b509a..5385b030ba 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-12  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.base/macscp.exp: Avoid the first FAIL if macro information
+	is missing.
+
 2009-11-12  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* gdb.base/break.c (need_malloc): New.
diff --git a/gdb/testsuite/gdb.base/macscp.exp b/gdb/testsuite/gdb.base/macscp.exp
index 55c4d31db5..c63dde2ad8 100644
--- a/gdb/testsuite/gdb.base/macscp.exp
+++ b/gdb/testsuite/gdb.base/macscp.exp
@@ -204,30 +204,27 @@ proc list_and_check_macro {func macro expected} {
     return [check_macro $macro $expected "after `list $func'"]
 }
 
-
-if {[list_and_check_macro main WHERE {macscp1.c {before macscp1_3}}]} {
-    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)."
-	}
+gdb_test "list main" ".*main.*" "list main for support check"
+set macro_support "unknown"
+gdb_test_multiple "info source" "Test macro information"  {
+    -re "Includes preprocessor macro info\..*$gdb_prompt $" {
+	set macro_support 1
+	verbose "Source has macro information"
     }
-    if {$macro_support == 0} {
-	unsupported "Skipping test because debug information does not include macro information."
-	return 0
+    -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 main WHERE {macscp1.c {before macscp1_3}}
 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}}