diff options
| author | Nerijus Arlauskas <nercury@gmail.com> | 2016-05-05 01:10:29 +0300 |
|---|---|---|
| committer | Nerijus Arlauskas <nercury@gmail.com> | 2016-05-07 13:36:13 +0300 |
| commit | ca03b81abb62b12853d9e0133765355dc6958c59 (patch) | |
| tree | e92aa2e2a13db2f6a0f983ca890ae4476df37fb0 | |
| parent | b6fc4abe44da7563851c8e137e16a72f2d7d6832 (diff) | |
| download | rust-ca03b81abb62b12853d9e0133765355dc6958c59.tar.gz rust-ca03b81abb62b12853d9e0133765355dc6958c59.zip | |
Check for both arm and armv7 android targets in runtest.
| -rw-r--r-- | src/tools/compiletest/src/runtest.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs index 74e4b81f555..aa1b9d2bafb 100644 --- a/src/tools/compiletest/src/runtest.rs +++ b/src/tools/compiletest/src/runtest.rs @@ -33,7 +33,7 @@ use std::process::{Command, Output, ExitStatus}; pub fn run(config: Config, testpaths: &TestPaths) { match &*config.target { - "arm-linux-androideabi" | "aarch64-linux-android" => { + "arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => { if !config.adb_device_status { panic!("android device not available"); } @@ -424,7 +424,7 @@ actual:\n\ let debugger_run_result; match &*self.config.target { - "arm-linux-androideabi" | "aarch64-linux-android" => { + "arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => { cmds = cmds.replace("run", "continue"); @@ -1132,7 +1132,7 @@ actual:\n\ match &*self.config.target { - "arm-linux-androideabi" | "aarch64-linux-android" => { + "arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => { self._arm_exec_compiled_test(env) } @@ -1230,7 +1230,7 @@ actual:\n\ } match &*self.config.target { - "arm-linux-androideabi" | "aarch64-linux-android" => { + "arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => { self._arm_push_aux_shared_library(); } _ => {} |