Auto merge of #2678 - matklad:simplify-tests-2, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 12 May 2016 21:09:45 +0000 (14:09 -0700)
committerbors <bors@rust-lang.org>
Thu, 12 May 2016 21:09:45 +0000 (14:09 -0700)
Simplify more tests

This is the followup of #2670

It contains [one](https://github.com/rust-lang/cargo/commit/28887beee054bfa9b56207667df3f5ae38a8ac6f#diff-ebcf8bfb935037902f135a7c225479b5L322) more or less significant change, everything else is just search/replace.

r? @alexcrichton

1  2 
tests/support/mod.rs

Simple merge