Auto merge of #5513 - ehuss:test-binary-panic, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 10 May 2018 22:10:48 +0000 (22:10 +0000)
committerbors <bors@rust-lang.org>
Thu, 10 May 2018 22:10:48 +0000 (22:10 +0000)
Fix `panic` for binaries built during tests.

Fixes #5435

Also re-enable tests now that #5460 has landed.


Trivial merge