X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Ftestsuite%2Fgdb.base%2Fcondbreak.exp;h=ae0858bf52bcf2e76dcf155f1ada321390858d09;hb=c2c6d25f0d5eea4f834420870021a8c52db24018;hp=281616b68a4f89200c5872ffface47daf3dc38a0;hpb=cce74817d9cdf9bdc375a599565105d78e07d167;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index 281616b68a..ae0858bf52 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+# Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -21,8 +21,6 @@
 # Purpose is to test conditional breakpoints.
 # Modeled after "break.exp".
 
-
-
 if $tracelevel then {
 	strace $tracelevel
 	}
@@ -35,7 +33,7 @@ global usestubs
 set prms_id 0
 set bug_id 0
 
-set testfile "condbreak"
+set testfile "break"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
@@ -43,6 +41,10 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {deb
     gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
 }
 
+if [get_compiler_info ${binfile}] {
+    return -1;
+}
+
 gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
@@ -74,8 +76,8 @@ gdb_test "delete 2" \
 #
 # test conditional break at line number
 #
-gdb_test "break 64 if 1==1" \
-    "Breakpoint.*at.* file .*$srcfile, line 64\\." \
+gdb_test "break 79 if 1==1" \
+    "Breakpoint.*at.* file .*$srcfile, line 79\\." \
     "break line if condition"
 
 gdb_test "delete 3" \
@@ -92,8 +94,8 @@ gdb_test "break marker1 if (1==1)" \
 #
 # test conditional break at line number
 #
-gdb_test "break 64 if (1==1)" \
-    "Breakpoint.*at.* file .*$srcfile, line 64\\." \
+gdb_test "break 79 if (1==1)" \
+    "Breakpoint.*at.* file .*$srcfile, line 79\\." \
     "break line if (condition)"
 
 gdb_test "break marker2 if (a==43)" \
@@ -104,15 +106,23 @@ gdb_test "break marker2 if (a==43)" \
 # check to see what breakpoints are set
 #
 
-set main_line 60
+if {$hp_aCC_compiler} {
+    set marker1_proto "\\(void\\)"
+    set marker2_proto "\\(int\\)"
+} else {
+    set marker1_proto ""
+    set marker2_proto ""
+}
+
+set main_line 75
 gdb_test "info break" \
     "Num Type\[ \]+Disp Enb Address\[ \]+What.*
 \[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:$main_line.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in marker1 at .*$srcfile:41.*
+\[0-9\]+\[\t \]+breakpoint     keep y.* in marker1$marker1_proto at .*$srcfile:4\[38\].*
 \[\t \]+stop only if 1 == 1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:64.*
+\[0-9\]+\[\t \]+breakpoint     keep y.* in main at .*$srcfile:79.*
 \[\t \]+stop only if 1 == 1.*
-\[0-9\]+\[\t \]+breakpoint     keep y.* in marker2 at .*$srcfile:42.*
+\[0-9\]+\[\t \]+breakpoint     keep y.* in marker2$marker2_proto at .*$srcfile:4\[49\].*
 \[\t \]+stop only if a == 43.*" \
     "breakpoint info"
 
@@ -127,19 +137,20 @@ rerun_to_main
 #
 # run until the breakpoint at a line number
 #
-gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:64.*64\[\t \]+printf.*factorial.*" \
+gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, main \\(argc=.*, argv=.*, envp=.*\\) at .*$srcfile:79.*79\[\t \]+printf.*factorial.*" \
 			"run until breakpoint set at a line number"
 
 #
 # run until the breakpoint at marker1
 #
-gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker1 \\(\\) at .*$srcfile:41.*41\[\t \]+.*" \
+gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker1 \\(\\) at .*$srcfile:4\[38\].*4\[38\]\[\t \]+.*" \
 			"run until breakpoint at marker1"
 
 #
 # run until the breakpoint at marker2
 #
-gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile:42.*42\[\t \]+.*" \
+setup_xfail hppa2.0w-*-* 11512CLLbs
+gdb_test "continue" "Continuing\\..*Breakpoint \[0-9\]+, marker2 \\(a=43\\) at .*$srcfile:4\[49\].*4\[49\]\[\t \]+.*" \
 			"run until breakpoint at marker2"