From: Ximin Luo <infinity0@pwned.gg>
Date: Thu, 15 Mar 2018 15:17:00 +0000 (+0100)
Subject: Revert "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~23^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=89d274875fe79f37bc36f22d6afa63f5f854de03;p=cargo.git

Revert "Work around #5134 for now"

This reverts commit d46db71b3ff17dfc0f4be6308c8b94613d65a572.
---

diff --git a/tests/testsuite/build.rs b/tests/testsuite/build.rs
index 7cf2e0116..86a1e58c9 100644
--- a/tests/testsuite/build.rs
+++ b/tests/testsuite/build.rs
@@ -5426,11 +5426,9 @@ fn avoid_dev_deps() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    // --bins is needed because of #5134
-    assert_that(p.cargo("build").arg("--bins"), execs().with_status(101));
+    assert_that(p.cargo("build"), 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 b3e5c5bf3..5acdb6292 100644
--- a/tests/testsuite/install.rs
+++ b/tests/testsuite/install.rs
@@ -1222,9 +1222,8 @@ fn dev_dependencies_no_check() {
         .file("src/main.rs", "fn main() {}")
         .build();
 
-    // --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));
+    assert_that(p.cargo("build"), execs().with_status(101));
+    assert_that(p.cargo("install"), execs().with_status(0));
 }
 
 #[test]
@@ -1256,10 +1255,9 @@ fn dev_dependencies_lock_file_untouched() {
         .file("a/src/lib.rs", "")
         .build();
 
-    // --bins is needed because of #5134
-    assert_that(p.cargo("build").arg("--bins"), execs().with_status(0));
+    assert_that(p.cargo("build"), execs().with_status(0));
     let lock = p.read_lockfile();
-    assert_that(p.cargo("install").arg("--bins"), execs().with_status(0));
+    assert_that(p.cargo("install"), execs().with_status(0));
     let lock2 = p.read_lockfile();
     assert!(lock == lock2, "different lockfiles");
 }