From 46aa3a328445b01913bd098428a7dc3f7749553c Mon Sep 17 00:00:00 2001
From: David Herman <david.herman@gmail.com>
Date: Mon, 30 Sep 2019 13:23:39 -0700
Subject: [PATCH] We didn't actually need the CI flag after all; just
 `#[ignore]` the static tests for all Rust versions except beta.

---
 .travis.yml  |  2 +-
 Cargo.toml   |  3 ---
 appveyor.yml |  2 +-
 build.rs     |  3 ---
 src/lib.rs   | 10 +++++-----
 5 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 60029fa..41cdd21 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -42,7 +42,7 @@ addons:
     - g++-4.8
 
 script: |
-  cargo test --release --features=ci -- --nocapture
+  cargo test --release -- --nocapture
 
 jobs:
   include:
diff --git a/Cargo.toml b/Cargo.toml
index e31d027..784fae2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,9 +34,6 @@ legacy-runtime = ["neon-runtime/neon-sys", "neon-build/neon-sys"]
 # is disabled by default.
 napi-runtime = ["neon-runtime/nodejs-sys"]
 
-# Enabled by CI configs to allow selective enabling/disabling of tests in CI.
-ci = []
-
 [workspace]
 members = [
     "crates/neon-build",
diff --git a/appveyor.yml b/appveyor.yml
index 58c64b4..7599176 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -40,7 +40,7 @@ install:
 build: false
 
 test_script:
-  - cargo test -vv --release --features=ci static -- --nocapture
+  - cargo test --release
 
 cache:
   - target
diff --git a/build.rs b/build.rs
index c9ce9be..f2851a0 100644
--- a/build.rs
+++ b/build.rs
@@ -2,9 +2,6 @@ use std::env;
 
 fn main() {
     if let Ok(profile) = env::var("PROFILE") {
-        eprintln!("neon/build.rs: setting neon_profile={}", profile);
         println!("cargo:rustc-cfg=neon_profile={:?}", profile);
-    } else {
-        eprintln!("neon/build.rs: NOT setting neon_proifle");
     }
 }
diff --git a/src/lib.rs b/src/lib.rs
index 60d76fa..dffe206 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -411,16 +411,16 @@ mod tests {
         run("cargo test --release", &project_root().join("test").join("static"));
     }
 
-    // In CI, we'll only run the static tests in Beta. This will catch changes to
-    // error reporting and any associated usability regressions before a new Rust
-    // version is released, but will have more stable results than Nightly.
-    #[cfg(feature = "ci")]
+    // Only run the static tests in Beta. This will catch changes to error reporting
+    // and any associated usability regressions before a new Rust version is shipped
+    // but will have more stable results than Nightly.
     #[rustversion::beta]
     #[test]
     fn static_test() { static_test_impl() }
 
-    #[cfg(not(feature = "ci"))]
+    #[rustversion::not(beta)]
     #[test]
+    #[ignore]
     fn static_test() { static_test_impl() }
 
     #[test]