diff options
| author | bors <bors@rust-lang.org> | 2017-07-20 13:58:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-20 13:58:03 +0000 |
| commit | ae98ebfcb9ad5a5384fd229a6ee91315b02ca969 (patch) | |
| tree | d47b0d9d321d29c78301a67533be6d570e22802f /src/bootstrap | |
| parent | 9d54ebe550167c1c9ef0bad56046a382a04dc604 (diff) | |
| parent | bbdbb654679eba68ff505a55ad224c5c04f5517f (diff) | |
| download | rust-ae98ebfcb9ad5a5384fd229a6ee91315b02ca969.tar.gz rust-ae98ebfcb9ad5a5384fd229a6ee91315b02ca969.zip | |
Auto merge of #43281 - mmatyas:remotetest_env, r=alexcrichton
Allow remote testing remotely when `TEST_DEVICE_ADDR` is set Remote testing was added in #41268, but at the moment it's only enabled if QEMU is also available or we're testing Android. This patch also allows remote testing if the environment variable `TEST_DEVICE_ADDR` is set, as required by `remote-test-client` [[1](https://github.com/rust-lang/rust/blob/master/src/tools/remote-test-client/src/main.rs#L28), [2](https://github.com/rust-lang/rust/blob/master/src/tools/remote-test-client/src/main.rs#L61)]
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/lib.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs index 032231582ef..e06de5bac4b 100644 --- a/src/bootstrap/lib.rs +++ b/src/bootstrap/lib.rs @@ -920,7 +920,8 @@ impl Build { /// Returns whether the target will be tested using the `remote-test-client` /// and `remote-test-server` binaries. fn remote_tested(&self, target: &str) -> bool { - self.qemu_rootfs(target).is_some() || target.contains("android") + self.qemu_rootfs(target).is_some() || target.contains("android") || + env::var_os("TEST_DEVICE_ADDR").is_some() } /// Returns the root of the "rootfs" image that this target will be using, |