Skip to content

Commit f14aa81

Browse files
authored
Merge pull request #6099 from cre4ture/fix/android_od_test_f16
test_od - re-enable f16 test with newer AVD system image
2 parents ee1740e + 89110ab commit f14aa81

File tree

2 files changed

+2
-9
lines changed

2 files changed

+2
-9
lines changed

.github/workflows/android.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ concurrency:
1919

2020
env:
2121
TERMUX: v0.118.0
22-
KEY_POSTFIX: nextest+rustc-hash+adb+sshd+upgrade+XGB+inc15
22+
KEY_POSTFIX: nextest+rustc-hash+adb+sshd+upgrade+XGB+inc17
2323
COMMON_EMULATOR_OPTIONS: -no-window -noaudio -no-boot-anim -camera-back none -gpu swiftshader_indirect
2424
EMULATOR_DISK_SIZE: 12GB
2525
EMULATOR_HEAP_SIZE: 2048M
@@ -36,7 +36,7 @@ jobs:
3636
cores: [4] # , 6
3737
ram: [4096, 8192]
3838
api-level: [28]
39-
target: [default]
39+
target: [google_apis_playstore]
4040
arch: [x86, x86_64] # , arm64-v8a
4141
exclude:
4242
- ram: 8192

tests/by-util/test_od.rs

-7
Original file line numberDiff line numberDiff line change
@@ -229,13 +229,6 @@ fn test_hex32() {
229229
.stdout_is(expected_output);
230230
}
231231

232-
// This test fails on Android CI on AVD on Ubuntu Github runners.
233-
// It was never reproducible locally and seems to be very hard to fix.
234-
// Thats why its disabled for android x86*. See uutils issue #5941.
235-
#[cfg(not(all(
236-
target_os = "android",
237-
any(target_arch = "x86", target_arch = "x86_64")
238-
)))]
239232
#[test]
240233
fn test_f16() {
241234
let input: [u8; 14] = [

0 commit comments

Comments
 (0)