Skip to content

Commit b91f92c

Browse files
committed
---
yaml --- r: 276380 b: refs/heads/master c: ca03b81 h: refs/heads/master
1 parent 84c2e04 commit b91f92c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: b6fc4abe44da7563851c8e137e16a72f2d7d6832
2+
refs/heads/master: ca03b81abb62b12853d9e0133765355dc6958c59
33
refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
44
refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/tools/compiletest/src/runtest.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ use std::process::{Command, Output, ExitStatus};
3333
pub fn run(config: Config, testpaths: &TestPaths) {
3434
match &*config.target {
3535

36-
"arm-linux-androideabi" | "aarch64-linux-android" => {
36+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
3737
if !config.adb_device_status {
3838
panic!("android device not available");
3939
}
@@ -424,7 +424,7 @@ actual:\n\
424424

425425
let debugger_run_result;
426426
match &*self.config.target {
427-
"arm-linux-androideabi" | "aarch64-linux-android" => {
427+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
428428

429429
cmds = cmds.replace("run", "continue");
430430

@@ -1132,7 +1132,7 @@ actual:\n\
11321132

11331133
match &*self.config.target {
11341134

1135-
"arm-linux-androideabi" | "aarch64-linux-android" => {
1135+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
11361136
self._arm_exec_compiled_test(env)
11371137
}
11381138

@@ -1230,7 +1230,7 @@ actual:\n\
12301230
}
12311231

12321232
match &*self.config.target {
1233-
"arm-linux-androideabi" | "aarch64-linux-android" => {
1233+
"arm-linux-androideabi" | "armv7-linux-androideabi" | "aarch64-linux-android" => {
12341234
self._arm_push_aux_shared_library();
12351235
}
12361236
_ => {}

0 commit comments

Comments
 (0)