Merge pull request #3647 from devnexen/fix_linux_relr_tests

JohnTitor · web-flow · commit df520eb2b170 · 2024-04-17T11:03:35.000Z
attempt to fix #3641
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -3507,7 +3507,8 @@ fn test_linux(target: &str) {
 
     cfg.skip_type(move |ty| {
         // FIXME: very recent additions to musl, not yet released.
-        if musl && (ty == "Elf32_Relr" || ty == "Elf64_Relr") {
+        // also apparently some glibc versions
+        if ty == "Elf32_Relr" || ty == "Elf64_Relr" {
             return true;
         }
         if sparc64 && (ty == "Elf32_Rela" || ty == "Elf64_Rela") {

Original file line number	Diff line number	Diff line change
`@@ -3507,7 +3507,8 @@ fn test_linux(target: &str) {`
`3507`	`3507`
`3508`	`3508`	`cfg.skip_type(move \|ty\| {`
`3509`	`3509`	`// FIXME: very recent additions to musl, not yet released.`
`3510`		`- if musl && (ty == "Elf32_Relr" \|\| ty == "Elf64_Relr") {`
	`3510`	`+ // also apparently some glibc versions`
	`3511`	`+ if ty == "Elf32_Relr" \|\| ty == "Elf64_Relr" {`
`3511`	`3512`	`return true;`
`3512`	`3513`	`}`
`3513`	`3514`	`if sparc64 && (ty == "Elf32_Rela" \|\| ty == "Elf64_Rela") {`