Skip to content

Commit

Permalink
ci: try fix horrible shit show 20 (cleanup, Jebus)
Browse files Browse the repository at this point in the history
  • Loading branch information
larpon committed Oct 10, 2024
1 parent 3721ab6 commit 2f8ec54
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
7 changes: 4 additions & 3 deletions android/emulator/emulator.v
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,10 @@ pub fn Emulator.list_avds() !map[string]string {
return m
// TODO: find out how to fix this dumb mess for users
// if vab_test_avd !in avds {
// // Locating a deterministic location of AVD's has, like so many other Android related things, become a mess.
// // (`avdmanager` can put them in places that the `emulator` does not pickup on the *same* host etc... Typical Google-mess)
// // Here we try a few places and set `ANDROID_AVD_HOME` to make runs a bit more predictable.
// Locating a deterministic location of AVD's has, like so many other Android related things, become a mess.
// (`avdmanager` can put them in places that the `emulator` does not pickup on the *same* host etc... Typical Google-mess)
// ... even passing `--path` to `avdmanager` does not work.
// Here we try a few places and set `ANDROID_AVD_HOME` to make runs a bit more predictable.
// mut avd_home := os.join_path(os.home_dir(), '.android', 'avd')
// eprintln('warning: "${vab_test_avd}" still not in list: ${avds}... trying new location "${avd_home}"')
// os.setenv('ANDROID_AVD_HOME', avd_home, true)
Expand Down
3 changes: 2 additions & 1 deletion tests/at-runtime/emulator/emulator_test.vv
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ fn ensure_env() {
if !emulator.Emulator.has_avd(vab_test_avd) {
// Locating a deterministic location of AVD's has, like so many other Android related things, become a mess.
// (`avdmanager` can put them in places that the `emulator` does not pickup on the *same* host etc... Typical Google-mess)
// ... even passing `--path` to `avdmanager` does not work.
// Here we try a few places and set `ANDROID_AVD_HOME` to make runs a bit more predictable.
mut avd_home := os.join_path(os.home_dir(), '.android', 'avd')
eprintln('warning: "${vab_test_avd}" still not detected by emulator... trying new location "${avd_home}"')
Expand All @@ -121,7 +122,7 @@ fn ensure_env() {
}
}
eprintln('Listing avds after creation...')
avds = emulator.Emulator.list_avds() or {
avds := emulator.Emulator.list_avds() or {
eprintln('${exe_name} error: ${err}')
exit(1)
}
Expand Down

0 comments on commit 2f8ec54

Please sign in to comment.