Auto merge of #1075 - tbu-:pr_test_statics, r=alexcrichton

Theoretically test statics There are none of them in `libc` except for `__progname` on Android, but that one cannot be tested because it's not present in any header files.
rust-lang · Sep 13, 2018 · 878e6ae · 878e6ae
2 parents 995d7da + eb6bdf3
commit 878e6ae
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libc-test/Cargo.toml b/libc-test/Cargo.toml
@@ -9,7 +9,7 @@ path = ".."
 default-features = false
 
 [build-dependencies]
-ctest = "0.2"
+ctest = "0.2.2"
 
 [features]
 default = [ "use_std" ]

diff --git a/libc-test/build.rs b/libc-test/build.rs
@@ -794,6 +794,14 @@ fn main() {
         }
     });
 
+    cfg.skip_static(move |name| {
+        match name {
+            // Internal constant, not declared in any headers.
+            "__progname" if android => true,
+            _ => false,
+        }
+    });
+
     cfg.skip_fn_ptrcheck(move |name| {
         match name {
             // dllimport weirdness?
@@ -849,7 +857,8 @@ fn main() {
     // fails on a lot of platforms.
     let mut cfg = ctest::TestGenerator::new();
     cfg.skip_type(|_| true)
-       .skip_fn(|_| true);
+       .skip_fn(|_| true)
+       .skip_static(|_| true);
     if android || linux {
         // musl defines these directly in `fcntl.h`
         if musl {