Auto merge of #1346 - gnzlbg:simplify_freebsd, r=gnzlbg

Clean up libc-test/build.rs for FreeBSD and enable testing FreeBSD12 on CI

Author: bors

.cirrus.yml

@@ -1,14 +1,27 @@
-freebsd_instance:
-  image: freebsd-11-1-release-amd64
-
 task:
-  # This name gets reported as a build status in GitHub
-  name: stable x86_64-unknown-freebsd
+  name: stable x86_64-unknown-freebsd-11
+  freebsd_instance:
+    image: freebsd-11-2-release-amd64
   setup_script:
     - pkg install -y curl
     - curl https://sh.rustup.rs -sSf --output rustup.sh
     - sh rustup.sh -y
+    - . $HOME/.cargo/env
+    - rustup default stable
+  test_script:
+    - . $HOME/.cargo/env
+    - sh ci/run.sh x86_64-unknown-freebsd
+    
+task:
+  name: nightly x86_64-unknown-freebsd-12
+  freebsd_instance:
+    image: freebsd-12-0-release-amd64
+  setup_script:
+    - pkg install -y curl
+    - curl https://sh.rustup.rs -sSf --output rustup.sh
+    - sh rustup.sh --default-toolchain nightly -y
+    - . $HOME/.cargo/env
+    - rustup default nightly
   test_script:
     - . $HOME/.cargo/env
-    - cd libc-test
-    - cargo test
+    - sh ci/run.sh x86_64-unknown-freebsd

build.rs

@@ -16,6 +16,12 @@ fn main() {
         );
     }
 
+    if std::env::var("LIBC_CI").is_ok() {
+        if let Some(12) = which_freebsd() {
+            println!("cargo:rustc-cfg=freebsd12");
+        }
+    }
+
     // Rust >= 1.15 supports private module use:
     if rustc_minor_ver >= 15 || rustc_dep_of_std {
         println!("cargo:rustc-cfg=libc_priv_mod_use");
@@ -70,3 +76,26 @@ fn rustc_minor_version() -> Option<u32> {
 
     otry!(pieces.next()).parse().ok()
 }
+
+fn which_freebsd() -> Option<i32> {
+    let output = std::process::Command::new("freebsd-version").output().ok();
+    if output.is_none() {
+        return None;
+    }
+    let output = output.unwrap();
+    if !output.status.success() {
+        return None;
+    }
+
+    let stdout = String::from_utf8(output.stdout).ok();
+    if stdout.is_none() {
+        return None;
+    }
+    let stdout = stdout.unwrap();
+
+    match &stdout {
+        s if s.starts_with("11") => Some(11),
+        s if s.starts_with("12") => Some(12),
+        _ => None,
+    }
+}

ci/run.sh

@@ -87,10 +87,12 @@ if [ "$TARGET" = "x86_64-unknown-linux-gnux32" ]; then
   opt="--release"
 fi
 
-cargo test $opt --no-default-features --manifest-path libc-test/Cargo.toml \
+export LIBC_CI=1
+
+cargo test -vv $opt --no-default-features --manifest-path libc-test/Cargo.toml \
       --target "${TARGET}"
 
-cargo test $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}"
+cargo test -vv $opt --manifest-path libc-test/Cargo.toml --target "${TARGET}"
 
-cargo test $opt --features extra_traits --manifest-path libc-test/Cargo.toml \
+cargo test -vv $opt --features extra_traits --manifest-path libc-test/Cargo.toml \
       --target "${TARGET}"