skip style test in ci

Author: rmehri01

ci/run.sh

@@ -80,7 +80,8 @@ if [ -n "${QEMU:-}" ]; then
     exec grep -E "^(PASSED)|(test result: ok)" "${CARGO_TARGET_DIR}/out.log"
 fi
 
-cmd="env LIBC_CI=1 cargo test --target $target ${LIBC_CI_ZBUILD_STD+"-Zbuild-std"}"
+cmd="cargo test --target $target ${LIBC_CI_ZBUILD_STD+"-Zbuild-std"}"
+test_flags="--skip check_style"
 
 # Run tests in the `libc` crate
 case "$target" in
@@ -101,25 +102,25 @@ if [ "$target" = "s390x-unknown-linux-gnu" ]; then
     passed=0
     until [ $n -ge $N ]; do
         if [ "$passed" = "0" ]; then
-            if $cmd --no-default-features; then
+            if eval "$cmd --no-default-features -- $test_flags"; then
                 passed=$((passed+1))
                 continue
             fi
         elif [ "$passed" = "1" ]; then
-            if $cmd; then
+            if eval "$cmd -- $test_flags"; then
                 passed=$((passed+1))
                 continue
             fi
         elif [ "$passed" = "2" ]; then
-            if $cmd --features extra_traits; then
+            if eval "$cmd --features extra_traits -- $test_flags"; then
                 break
             fi
         fi
         n=$((n+1))
         sleep 1
     done
 else
-    $cmd --no-default-features
-    $cmd
-    $cmd --features extra_traits
+    eval "$cmd --no-default-features -- $test_flags"
+    eval "$cmd -- $test_flags"
+    eval "$cmd --features extra_traits -- $test_flags"
 fi

ci/runtest-android.rs

@@ -1,11 +1,11 @@
 use std::env;
-use std::process::Command;
 use std::path::{Path, PathBuf};
+use std::process::Command;
 
 fn main() {
     let args = env::args_os()
         .skip(1)
-        .filter(|arg| arg != "--quiet")
+        .filter(|arg| arg != "--quiet" && arg != "--skip" && arg != "check_style")
         .collect::<Vec<_>>();
     assert_eq!(args.len(), 1);
     let test = PathBuf::from(&args[0]);
@@ -36,14 +36,16 @@ fn main() {
     let stdout = String::from_utf8_lossy(&output.stdout);
     let stderr = String::from_utf8_lossy(&output.stderr);
 
-    println!("status: {}\nstdout ---\n{}\nstderr ---\n{}",
-             output.status,
-             stdout,
-             stderr);
+    println!(
+        "status: {}\nstdout ---\n{}\nstderr ---\n{}",
+        output.status, stdout, stderr
+    );
 
-    if !stderr.lines().any(|l| (l.starts_with("PASSED ") && l.contains(" tests")) || l.starts_with("test result: ok"))
-        && !stdout.lines().any(|l| (l.starts_with("PASSED ") && l.contains(" tests")) || l.starts_with("test result: ok"))
-    {
+    if !stderr.lines().any(|l| {
+        (l.starts_with("PASSED ") && l.contains(" tests")) || l.starts_with("test result: ok")
+    }) && !stdout.lines().any(|l| {
+        (l.starts_with("PASSED ") && l.contains(" tests")) || l.starts_with("test result: ok")
+    }) {
         panic!("failed to find successful test run");
     };
 }

libc-test/test/style.rs

@@ -37,11 +37,6 @@ type Result<T> = std::result::Result<T, Error>;
 
 #[test]
 fn check_style() {
-    if env::var("LIBC_CI").is_ok() {
-        // we already run this in the style.sh script
-        return;
-    }
-
     let root_dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("../src");
     let mut errors = Errors { errs: false };
     walk(&root_dir, &mut errors).expect("root dir should be walked successfully");