Testsuite de-Linuxification

Testsuite de-Linuxification

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 2756 bytes --]

Hi!

I applied the following to fix some issues that crept in while I was not
looking.  Roland, based on surrounding code, at least the stack exec and
stack size ones should probably be enabled for NACL, too?

	* ld-elf/elf.exp (stack exec, stack size): Run for any GNU target.
	* ld-elf/maxpage3c.d: Run for any x86 GNU target.
	* ld-elf/maxpage4.d: Likewise.
	* ld-elf/maxpage5.d: Likewise.
	* ld-i386/export-class.exp: Likewise.

diff --git ld/testsuite/ld-elf/elf.exp ld/testsuite/ld-elf/elf.exp
index a33e3b6..8652131 100644
--- ld/testsuite/ld-elf/elf.exp
+++ ld/testsuite/ld-elf/elf.exp
@@ -126,7 +126,8 @@ if { [check_gc_sections_available] && ![istarget "v850-*-*"] } {
     }
 }
 
-if { [istarget *-*-*linux*] } {
+if { [istarget *-*-linux*]
+     || [istarget *-*-gnu*] } {
     run_ld_link_tests {
 	{"stack exec" "-z execstack" "" {stack.s}
 	    {{readelf {-Wl} stack-exec.rd}} "stack-exec.exe"}
diff --git ld/testsuite/ld-elf/maxpage3c.d ld/testsuite/ld-elf/maxpage3c.d
index 66fef32..354a8b9 100644
--- ld/testsuite/ld-elf/maxpage3c.d
+++ ld/testsuite/ld-elf/maxpage3c.d
@@ -2,7 +2,7 @@
 #as: --32
 #ld: -m elf_i386 -z max-page-size=0x10000000 -T maxpage3.t
 #readelf: -lS --wide
-#target: x86_64-*-linux* i?86-*-linux-gnu
+#target: x86_64-*-linux* i?86-*-linux-gnu i?86-*-gnu*
 
 #...
   \[[ 0-9]+\] \.data[ \t]+PROGBITS[ \t]+0*10000000[ \t]+[ \t0-9a-f]+WA?.*
diff --git ld/testsuite/ld-elf/maxpage4.d ld/testsuite/ld-elf/maxpage4.d
index cde43d7..a08e856 100644
--- ld/testsuite/ld-elf/maxpage4.d
+++ ld/testsuite/ld-elf/maxpage4.d
@@ -2,7 +2,7 @@
 #as: --32
 #ld: -z max-page-size=0x200000 -T maxpage4.t
 #readelf: -l --wide
-#target: x86_64-*-linux* i?86-*-linux-gnu
+#target: x86_64-*-linux* i?86-*-linux-gnu i?86-*-gnu*
 
 #...
   LOAD+.*0x200000
diff --git ld/testsuite/ld-elf/maxpage5.d ld/testsuite/ld-elf/maxpage5.d
index bcbd39c..9d9b57a 100644
--- ld/testsuite/ld-elf/maxpage5.d
+++ ld/testsuite/ld-elf/maxpage5.d
@@ -3,7 +3,7 @@
 #ld: -z max-page-size=0x200000 -T maxpage5.t
 #objcopy_linked_file: -R .foo
 #readelf: -l --wide
-#target: x86_64-*-linux* i?86-*-linux-gnu
+#target: x86_64-*-linux* i?86-*-linux-gnu i?86-*-gnu*
 
 #...
 Program Headers:
diff --git ld/testsuite/ld-i386/export-class.exp ld/testsuite/ld-i386/export-class.exp
index cd96b4b..9dedd90 100644
--- ld/testsuite/ld-i386/export-class.exp
+++ ld/testsuite/ld-i386/export-class.exp
@@ -29,9 +29,8 @@ if { ![is_elf_format] } {
     return
 }
 
-# Exclude non-Linux targets; feel free to include your favorite one
-# if you like.
-if { ![istarget i?86-*-linux*] } {
+if { !([istarget i?86-*-linux*]
+       || [istarget i?86-*-gnu*]) } {
     return
 }
 


Grüße,
 Thomas

[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]

Re: Testsuite de-Linuxification

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 1166 bytes --]

Hi!

On Sat, 15 Dec 2012 11:31:28 +0100, I wrote:
> 	* ld-elf/elf.exp (stack exec, stack size): Run for any GNU target.

> diff --git ld/testsuite/ld-elf/elf.exp ld/testsuite/ld-elf/elf.exp
> index a33e3b6..8652131 100644
> --- ld/testsuite/ld-elf/elf.exp
> +++ ld/testsuite/ld-elf/elf.exp
> @@ -126,7 +126,8 @@ if { [check_gc_sections_available] && ![istarget "v850-*-*"] } {
>      }
>  }
>  
> -if { [istarget *-*-*linux*] } {
> +if { [istarget *-*-linux*]
> +     || [istarget *-*-gnu*] } {

... and the following copy'n'paste-o fix on top:

Index: ld/testsuite/ld-elf/elf.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-elf/elf.exp,v
retrieving revision 1.40
diff -u -p -r1.40 elf.exp
--- ld/testsuite/ld-elf/elf.exp	15 Dec 2012 10:28:17 -0000	1.40
+++ ld/testsuite/ld-elf/elf.exp	15 Dec 2012 10:33:41 -0000
@@ -126,7 +126,7 @@ if { [check_gc_sections_available] && ![
     }
 }
 
-if { [istarget *-*-linux*]
+if { [istarget *-*-*linux*]
      || [istarget *-*-gnu*] } {
     run_ld_link_tests {
 	{"stack exec" "-z execstack" "" {stack.s}


Grüße,
 Thomas

[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]

Re: Testsuite de-Linuxification

[Roland McGrath]

Thanks for the pointer, Thomas.

I've committed the following patch.


Thanks,
Roland


ld/testsuite/
2012-12-17  Roland McGrath  <mcgrathr@google.com>

	* ld-elf/elf.exp (stack exec, stack size): Run for *-*-nacl* targets.
	* ld-i386/export-class.exp: Run for i?86-*-nacl* targets.

--- a/ld/testsuite/ld-elf/elf.exp
+++ b/ld/testsuite/ld-elf/elf.exp
@@ -127,6 +127,7 @@ if { [check_gc_sections_available] && ![istarget
"v850-*-*"] } {
 }

 if { [istarget *-*-*linux*]
+     || [istarget *-*-nacl*]
      || [istarget *-*-gnu*] } {
     run_ld_link_tests {
 	{"stack exec" "-z execstack" "" {stack.s}
--- a/ld/testsuite/ld-i386/export-class.exp
+++ b/ld/testsuite/ld-i386/export-class.exp
@@ -30,6 +30,7 @@ if { ![is_elf_format] } {
 }

 if { !([istarget i?86-*-linux*]
+       || [istarget i?86-*-nacl*]
        || [istarget i?86-*-gnu*]) } {
     return
 }

Re: Testsuite de-Linuxification

[Maciej W. Rozycki]

Thomas,

> I applied the following to fix some issues that crept in while I was not
> looking.  Roland, based on surrounding code, at least the stack exec and
> stack size ones should probably be enabled for NACL, too?
> 
> 	* ld-elf/elf.exp (stack exec, stack size): Run for any GNU target.
> 	* ld-elf/maxpage3c.d: Run for any x86 GNU target.
> 	* ld-elf/maxpage4.d: Likewise.
> 	* ld-elf/maxpage5.d: Likewise.
> 	* ld-i386/export-class.exp: Likewise.
> 
[...]
> diff --git ld/testsuite/ld-i386/export-class.exp ld/testsuite/ld-i386/export-class.exp
> index cd96b4b..9dedd90 100644
> --- ld/testsuite/ld-i386/export-class.exp
> +++ ld/testsuite/ld-i386/export-class.exp
> @@ -29,9 +29,8 @@ if { ![is_elf_format] } {
>      return
>  }
>  
> -# Exclude non-Linux targets; feel free to include your favorite one
> -# if you like.
> -if { ![istarget i?86-*-linux*] } {
> +if { !([istarget i?86-*-linux*]
> +       || [istarget i?86-*-gnu*]) } {
>      return
>  }
>  

 I disagree with the removal of the comment (although a rewording would be 
due of course), there are other x86 targets that use ELF shared libraries, 
such as SCO OpenServer or Unixware, and that are likely to support export 
classes.  Someone who cares about such targets may be still interested in 
adding them to this test case.

 That said, I have since discovered the existence of the 
check_shared_lib_support procedure -- perhaps we should simply use that 
instead to relieve the maintainers (if any) of the more exotic platforms 
from the burden of chasing such subtleties across the test suite.  
Thoughts?

  Maciej

Re: Testsuite de-Linuxification

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 2242 bytes --]

Hi!

On Mon, 7 Jan 2013 16:19:47 +0000, "Maciej W. Rozycki" <macro@codesourcery.com> wrote:
> > diff --git ld/testsuite/ld-i386/export-class.exp ld/testsuite/ld-i386/export-class.exp
> > index cd96b4b..9dedd90 100644
> > --- ld/testsuite/ld-i386/export-class.exp
> > +++ ld/testsuite/ld-i386/export-class.exp
> > @@ -29,9 +29,8 @@ if { ![is_elf_format] } {
> >      return
> >  }
> >  
> > -# Exclude non-Linux targets; feel free to include your favorite one
> > -# if you like.
> > -if { ![istarget i?86-*-linux*] } {
> > +if { !([istarget i?86-*-linux*]
> > +       || [istarget i?86-*-gnu*]) } {
> >      return
> >  }
> >  
> 
>  I disagree with the removal of the comment (although a rewording would be 
> due of course), there are other x86 targets that use ELF shared libraries, 
> such as SCO OpenServer or Unixware, and that are likely to support export 
> classes.  Someone who cares about such targets may be still interested in 
> adding them to this test case.

You're right; I meant to do the same rewording as I had done in commit
16462cec50da2d070bd7d41fc4092a6abb469953 (2012-02-20).  I have now
committed the following:

ld/testsuite/
	* ld-i386/export-class.exp: Restore (and reword) comment about
	excluded targets.

Index: ld/testsuite/ld-i386/export-class.exp
===================================================================
RCS file: /cvs/src/src/ld/testsuite/ld-i386/export-class.exp,v
retrieving revision 1.3
diff -u -p -r1.3 export-class.exp
--- ld/testsuite/ld-i386/export-class.exp	17 Dec 2012 19:32:52 -0000	1.3
+++ ld/testsuite/ld-i386/export-class.exp	8 Jan 2013 10:23:56 -0000
@@ -29,6 +29,8 @@ if { ![is_elf_format] } {
     return
 }
 
+# Exclude some more targets; feel free to include your favorite one
+# if you like.
 if { !([istarget i?86-*-linux*]
        || [istarget i?86-*-nacl*]
        || [istarget i?86-*-gnu*]) } {


>  That said, I have since discovered the existence of the 
> check_shared_lib_support procedure -- perhaps we should simply use that 
> instead to relieve the maintainers (if any) of the more exotic platforms 
> from the burden of chasing such subtleties across the test suite.  

Fine my me.


Grüße,
 Thomas

[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]