Fix arm objdump tests on *BSD

Richard Earnshaw Richard.Earnshaw@buzzard.freeserve.co.uk
Fri Apr 20 06:18:00 GMT 2007


This patch fixes a failure of the thumb2 tests when they run on NetBSD.
This platform (and probably all other BSDs) have ptys that do tab
expansion, so the regular expressions failed to match.

I've also renamed the second test, since it was named identically to the
first...

R.

2007-04-20  Richard Earnshaw  <rearnsha@arm.com>

	* binutils-all/arm/thumb2-cond.s: Allow for tab expansion by the pty.
	Rename the second test.

Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/ChangeLog,v
retrieving revision 1.131
diff -p -r1.131 ChangeLog
*** ChangeLog	12 Apr 2007 19:20:46 -0000	1.131
--- ChangeLog	19 Apr 2007 23:26:13 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2007-04-20  Richard Earnshaw  <rearnsha@arm.com>
+ 
+ 	* binutils-all/arm/thumb2-cond.s: Allow for tab expansion by the pty.
+ 	Rename the second test.
+ 
  2007-04-12  H.J. Lu  <hongjiu.lu@intel.com>
  
  	PR binutils/4348
Index: binutils-all/arm/objdump.exp
===================================================================
RCS file: /cvs/src/src/binutils/testsuite/binutils-all/arm/objdump.exp,v
retrieving revision 1.2
diff -p -r1.2 objdump.exp
*** binutils-all/arm/objdump.exp	7 Jun 2006 14:08:18 -0000	1.2
--- binutils-all/arm/objdump.exp	19 Apr 2007 23:26:13 -0000
*************** if [is_remote host] {
*** 44,50 ****
  
  set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=6 $objfile"]
  
! set want "bcc.w\te12.*bx\tlr"
  
  if [regexp $want $got] then {
      pass "thumb2-cond test1"
--- 44,50 ----
  
  set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=6 $objfile"]
  
! set want "bcc.w\[ \t\]*e12.*bx\[ \t\]*lr"
  
  if [regexp $want $got] then {
      pass "thumb2-cond test1"
*************** if [regexp $want $got] then {
*** 54,63 ****
  
  set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=10 $objfile"]
  
! set want "bx\tlr"
  
  if [regexp $want $got] then {
!     pass "thumb2-cond test1"
  } else {
!     fail "thumb2-cond test1"
  }
--- 54,63 ----
  
  set got [binutils_run $OBJDUMP "$OBJDUMPFLAGS --disassemble --start-address=10 $objfile"]
  
! set want "bx\[ \t\]*lr"
  
  if [regexp $want $got] then {
!     pass "thumb2-cond test2"
  } else {
!     fail "thumb2-cond test2"
  }




More information about the Binutils mailing list