This is the mail archive of the binutils@sourceware.cygnus.com mailing list for the binutils project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Fix FIXME in gas elf testcases.



This adds a handy new feature to regexp_diff, and then uses it to
remove the XFAILS from gas/elf/section[01].

-- 
Geoffrey Keating <geoffk@cygnus.com>

===File ~/patches/cygnus/tx49-bin-elftest.patch=============
md5sum: 14982769071a6fa7 f68b415a3bdd24fc 84172
Index: binutils/gas/testsuite/ChangeLog
0a
Sun Oct 10 15:05:04 1999  Geoffrey Keating  <geoffk@cygnus.com>

	* lib/gas-defs.exp (regexp_diff): Allow '#...' to mean "some
 	indeterminate number of extra lines here".

	* gas/elf/elf.exp: Remove XFAILs.
	* gas/elf/section0.d: Make pass on MIPS (and hopefully alpha).
	* gas/elf/section1.d: Likewise.

.
Changed files:
binutils/gas/testsuite/ChangeLog
binutils/gas/testsuite/gas/elf/elf.exp
binutils/gas/testsuite/gas/elf/section0.d
binutils/gas/testsuite/gas/elf/section1.d
binutils/gas/testsuite/lib/gas-defs.exp
md5sum: 3736da8fb2ca1c13 2126a5b9c6556323 583
--- /sloth/disk0/co/binutils-mainline/binutils/gas/testsuite/gas/elf/elf.exp	Tue Aug 17 17:59:00 1999
+++ binutils/gas/testsuite/gas/elf/elf.exp	Sun Oct 10 16:21:00 1999
@@ -10,14 +10,6 @@ if { ([istarget "*-*-elf*"]		
      && ![istarget *-*-linux*aout*]
      && ![istarget *-*-linux*oldld*]
 } then {
-
-    # FIXME: This doesn't work for MIPS and alpha targets because of
-    # the .reginfo and .mdebug sections.
-    setup_xfail mips*-*-*
-    setup_xfail alpha*-*-*
     run_dump_test "section0" 
-
-    setup_xfail mips*-*-*
-    setup_xfail alpha*-*-*
     run_dump_test "section1" 
 }
md5sum: 9bfc87f93ee4796c 9d79f2884255d3f7 418
--- /sloth/disk0/co/binutils-mainline/binutils/gas/testsuite/gas/elf/section0.d	Sun Jun  6 09:14:42 1999
+++ binutils/gas/testsuite/gas/elf/section0.d	Sun Oct 10 16:16:32 1999
@@ -6,6 +6,8 @@
 Contents of section .text:
 Contents of section .data:
  0000 0000                                 ..              
+# The MIPS includes a 'section .reginfo' and such here.
+#...
 Contents of section A:
  0000 010101                               ...             
 Contents of section B:
md5sum: e45d2e45ed36f9cc aaf1f12cb3fc8747 418
--- /sloth/disk0/co/binutils-mainline/binutils/gas/testsuite/gas/elf/section1.d	Sun Jun  6 09:14:42 1999
+++ binutils/gas/testsuite/gas/elf/section1.d	Sun Oct 10 16:16:32 1999
@@ -6,6 +6,8 @@
 Contents of section .text:
 Contents of section .data:
  0000 000000                               ...             
+# The MIPS includes a 'section .reginfo' and such here.
+#...
 Contents of section A:
  0000 01010101 0101                        ......          
 Contents of section B:
md5sum: 77eaa466be672235 71db3374538931bd 15695
--- /sloth/disk0/co/binutils-mainline/binutils/gas/testsuite/lib/gas-defs.exp	Sun Sep 12 15:32:04 1999
+++ binutils/gas/testsuite/lib/gas-defs.exp	Sun Oct 10 16:16:32 1999
@@ -495,6 +495,20 @@ proc regexp_diff { file_1 file_2 } {
 		set end_2 1
 		set diff_pass 1
 		break
+	    } elseif [ string match "#..." $line_b ] {
+		if { [gets $file_b line_b] == $eof } {
+		    set end_2 1
+		    break
+		}
+		verbose "looking for \"^$line_b$\"" 3
+		while { ![regexp "^$line_b$" "$line_a"] } {
+		    verbose "skipping    \"$line_a\"" 3
+		    if { [gets $file_a line_a] == $eof } {
+			set end_1 1
+			break
+		    }
+		}
+		break
 	    }
 	    if { [gets $file_b line_b] == $eof } {
 		set end_2 1
============================================================

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]