Revert "Work around rust-lang#5134 for now"

This reverts commit d46db71.
infinity0 · Mar 15, 2018 · 89d2748 · 89d2748
1 parent 3e07a3e
commit 89d2748
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git 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
@@ -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");
 }