From: Ximin Luo <infinity0@pwned.gg>
Date: Wed, 7 Mar 2018 13:46:43 +0000 (+0100)
Subject: Work around #5134 for now
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~2^2~56^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d46db71b3ff17dfc0f4be6308c8b94613d65a572;p=cargo.git

Work around #5134 for now
---

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index e4237d864..669c17d41 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -4307,7 +4307,11 @@ fn avoid_dev_deps() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    assert_that(p.cargo("build"), execs().with_status(101));
-    assert_that(p.cargo("build").masquerade_as_nightly_cargo()
-                .arg("-Zavoid-dev-deps"), execs().with_status(0));
+    // --bins is needed because of #5134
+    assert_that(p.cargo("build").arg("--bins"),
+        execs().with_status(101));
+    assert_that(p.cargo("build").arg("--bins")
+                .masquerade_as_nightly_cargo()
+                .arg("-Zavoid-dev-deps"),
+        execs().with_status(0));
 }
diff --git a/tests/testsuite/install.rs b/tests/testsuite/install.rs
index bd58c6e6c..d8308ce5c 100644
--- a/tests/testsuite/install.rs
+++ b/tests/testsuite/install.rs
@@ -921,8 +921,11 @@ fn dev_dependencies_no_check() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    assert_that(p.cargo("build"), execs().with_status(101));
-    assert_that(p.cargo("install"), execs().with_status(0));
+    // --bins is needed because of #5134
+    assert_that(p.cargo("build").arg("--bins"),
+        execs().with_status(101));
+    assert_that(p.cargo("install").arg("--bins"),
+        execs().with_status(0));
 }
 
 #[test]
@@ -948,9 +951,12 @@ fn dev_dependencies_lock_file_untouched() {
         .file("a/src/lib.rs", "")
         .build();
 
-    assert_that(p.cargo("build"), execs().with_status(0));
+    // --bins is needed because of #5134
+    assert_that(p.cargo("build").arg("--bins"),
+        execs().with_status(0));
     let lock = p.read_lockfile();
-    assert_that(p.cargo("install"), execs().with_status(0));
+    assert_that(p.cargo("install").arg("--bins"),
+        execs().with_status(0));
     let lock2 = p.read_lockfile();
     assert!(lock == lock2, "different lockfiles");
 }