Skip to content

Commit ca03b81

Browse files
committed
Check for both arm and armv7 android targets in runtest.
1 parent b6fc4ab commit ca03b81

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/tools/compiletest/src/runtest.rs

+4-4
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)