WIP: temporarily disable fcntl and cmsg tests on android

gnzlbg · gnzlbg · commit eb74157f3d4a · 2019-05-16T16:17:51.000+02:00
diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -7,7 +7,7 @@ use std::env;
 
 fn do_cc() {
     let target = env::var("TARGET").unwrap();
-    if cfg!(unix) && !target.contains("wasi") {
+    if cfg!(unix) && !target.contains("wasi") && !target.contains("android") {
         cc::Build::new().file("src/cmsg.c").compile("cmsg");
     }
 }
@@ -1536,6 +1536,7 @@ fn test_android(target: &str) {
 
     cfg.generate("../src/lib.rs", "main.rs");
 
+    /*
     // On Android also generate another script for testing linux/fcntl
     // declarations. These cannot be tested normally because including both
     // `linux/fcntl.h` and `fcntl.h` fails.
@@ -1565,6 +1566,7 @@ fn test_android(target: &str) {
         t => t.to_string(),
     });
     cfg.generate("../src/lib.rs", "linux_fcntl.rs");
+    */
 }
 
 fn test_freebsd(target: &str) {

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ use std::env;`
`7`	`7`
`8`	`8`	`fn do_cc() {`
`9`	`9`	`let target = env::var("TARGET").unwrap();`
`10`		`- if cfg!(unix) && !target.contains("wasi") {`
	`10`	`+ if cfg!(unix) && !target.contains("wasi") && !target.contains("android") {`
`11`	`11`	`cc::Build::new().file("src/cmsg.c").compile("cmsg");`
`12`	`12`	`}`
`13`	`13`	`}`
`@@ -1536,6 +1536,7 @@ fn test_android(target: &str) {`
`1536`	`1536`
`1537`	`1537`	`cfg.generate("../src/lib.rs", "main.rs");`
`1538`	`1538`
	`1539`	`+ /*`
`1539`	`1540`	`// On Android also generate another script for testing linux/fcntl`
`1540`	`1541`	`// declarations. These cannot be tested normally because including both`
`1541`	`1542`	// `linux/fcntl.h` and `fcntl.h` fails.
`@@ -1565,6 +1566,7 @@ fn test_android(target: &str) {`
`1565`	`1566`	`t => t.to_string(),`
`1566`	`1567`	`});`
`1567`	`1568`	`cfg.generate("../src/lib.rs", "linux_fcntl.rs");`
	`1569`	`+ */`
`1568`	`1570`	`}`
`1569`	`1571`
`1570`	`1572`	`fn test_freebsd(target: &str) {`