'cargo update' test-cargo-miri

Author: RalfJung

test-cargo-miri/Cargo.lock

@@ -12,7 +12,6 @@ byteorder = "1.0"
 
 [dev-dependencies]
 rand = { version = "0.7", features = ["small_rng"] }
-num_cpus = "1.10.1"
 
 [lib]
 test = false # test that this is respected (will show in the output)

test-cargo-miri/Cargo.toml

@@ -19,6 +19,7 @@ fn main() {
     }
 
     // If there were no arguments, access stdin and test working dir.
+    // (We rely on the test runner to always disable isolation when passing no arguments.)
     if std::env::args().len() <= 1 {
         // CWD should be crate root.
         // We have to normalize slashes, as the env var might be set for a different target's conventions.
@@ -33,7 +34,7 @@ fn main() {
             let num: i32 = line.unwrap().parse().unwrap();
             println!("{}", 2*num);
         }
-        // On non-Unix, reading from stdin is not support. So we hard-code the right answer.
+        // On non-Unix, reading from stdin is not supported. So we hard-code the right answer.
         #[cfg(not(unix))]
         {
             println!("24");

test-cargo-miri/src/main.rs

@@ -12,3 +12,6 @@ path = "main.rs"
 name = "subtest"
 path = "test.rs"
 harness = false
+
+[dev-dependencies]
+num_cpus = "1.10.1"

test-cargo-miri/subcrate/Cargo.toml

@@ -10,4 +10,7 @@ fn main() {
     let crate_dir = env::var_os("CARGO_MANIFEST_DIR").unwrap();
     let crate_dir = crate_dir.to_string_lossy().replace("\\", "/");
     assert_eq!(env_dir, crate_dir);
+
+    // Make sure we can call `num_cpus`.
+    num_cpus::get();
 }

test-cargo-miri/subcrate/test.rs

@@ -4,7 +4,7 @@ running 1 test
 test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 0 filtered out
 
 
-running 8 tests
-..i.....
-test result: ok. 7 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
+running 7 tests
+..i....
+test result: ok. 6 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
 

test-cargo-miri/test.stdout.ref1

@@ -7,5 +7,5 @@ test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured; 1 filtered out
 running 1 test
 test simple1 ... ok
 
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 7 filtered out
+test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured; 6 filtered out
 

test-cargo-miri/test.stdout.ref2

@@ -1,13 +1,12 @@
 
-running 8 tests
+running 7 tests
 test cargo_env ... ok
 test do_panic ... ok
 test does_not_work_on_miri ... ignored
 test entropy_rng ... ok
 test fail_index_check ... ok
-test num_cpus ... ok
 test simple1 ... ok
 test simple2 ... ok
 
-test result: ok. 7 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
+test result: ok. 6 passed; 0 failed; 1 ignored; 0 measured; 0 filtered out
 

test-cargo-miri/test.stdout.ref3

@@ -37,11 +37,6 @@ fn entropy_rng() {
     let _val = rng.gen::<i128>();
 }
 
-#[test]
-fn num_cpus() {
-    assert_eq!(num_cpus::get(), 1);
-}
-
 #[test]
 fn cargo_env() {
     assert_eq!(env!("CARGO_PKG_NAME"), "cargo-miri-test");