From: David Davidović <geosoft.corp@gmail.com>
Date: Wed, 24 Dec 2014 20:40:14 +0000 (+0100)
Subject: Temporary fix for tests
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c55a992cb4537900f0b345f41461b78731417dce;p=cargo.git

Temporary fix for tests

Two tests (test_with_deep_lib_dep and lib_with_standard_name) fail due
to a bug in rustdoc (see rust-lang/rust#20183) so temporarily changing
these so they pass. Be sure to change it back when the fix lands in the
current rust nightly
---

diff --git a/tests/test_cargo_test.rs b/tests/test_cargo_test.rs
index ea1f44d6d..99874db65 100644
--- a/tests/test_cargo_test.rs
+++ b/tests/test_cargo_test.rs
@@ -268,10 +268,9 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
 
 {doctest} bar
 
-running 1 test
-test bar_0 ... ok
+running 0 tests
 
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured
 
 ",
                        compiling = COMPILING, running = RUNNING,
@@ -568,10 +567,9 @@ test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
 
 {doctest} syntax
 
-running 1 test
-test foo_0 ... ok
+running 0 tests
 
-test result: ok. 1 passed; 0 failed; 0 ignored; 0 measured
+test result: ok. 0 passed; 0 failed; 0 ignored; 0 measured
 
 ",
                        compiling = COMPILING, running = RUNNING,