mirror of
https://github.com/tw93/Mole.git
synced 2026-02-04 13:16:47 +00:00
feat: detect multiple NDK and Rust toolchain versions (#234)
Add report-only detection for multiple Android NDK and Rust toolchain installations. Users receive helpful guidance for manual cleanup via Android Studio SDK Manager or rustup commands. - Add check_android_ndk() and check_rust_toolchains() - Extract check_multiple_versions() helper (DRY) - Add 4 test cases, optimize test performance - Fix shellcheck warnings All 393 tests passing.
This commit is contained in:
@@ -40,7 +40,9 @@ EOF
|
||||
|
||||
# Source and run the function
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/bin/clean.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
# shellcheck disable=SC2329
|
||||
safe_clean() { :; }
|
||||
clean_dev_elixir > /dev/null 2>&1 || true
|
||||
|
||||
# Verify the file still exists
|
||||
@@ -67,7 +69,9 @@ EOF
|
||||
|
||||
# Source and run the function
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/bin/clean.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
# shellcheck disable=SC2329
|
||||
safe_clean() { :; }
|
||||
clean_dev_haskell > /dev/null 2>&1 || true
|
||||
|
||||
# Verify the file still exists
|
||||
@@ -109,9 +113,39 @@ EOF
|
||||
|
||||
# Source and run the function
|
||||
source "$PROJECT_ROOT/lib/core/common.sh"
|
||||
source "$PROJECT_ROOT/bin/clean.sh"
|
||||
source "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
# shellcheck disable=SC2329
|
||||
safe_clean() { :; }
|
||||
clean_dev_editors > /dev/null 2>&1 || true
|
||||
|
||||
# Verify the file still exists
|
||||
[ -f "$HOME/Library/Application Support/Code/User/workspaceStorage/abc123/workspace.json" ]
|
||||
}
|
||||
|
||||
@test "check_android_ndk reports multiple NDK versions" {
|
||||
run bash -c 'HOME=$(mktemp -d) && mkdir -p "$HOME/Library/Android/sdk/ndk"/{21.0.1,22.0.0,20.0.0} && source "$0" && note_activity() { :; } && NC="" && GREEN="" && GRAY="" && check_android_ndk' "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"Found 3 Android NDK versions"* ]]
|
||||
}
|
||||
|
||||
@test "check_android_ndk silent when only one NDK" {
|
||||
run bash -c 'HOME=$(mktemp -d) && mkdir -p "$HOME/Library/Android/sdk/ndk/22.0.0" && source "$0" && note_activity() { :; } && NC="" && GREEN="" && GRAY="" && check_android_ndk' "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" != *"Found"*"NDK"* ]]
|
||||
}
|
||||
|
||||
@test "check_rust_toolchains reports multiple toolchains" {
|
||||
run bash -c 'HOME=$(mktemp -d) && mkdir -p "$HOME/.rustup/toolchains"/{stable,nightly,1.75.0}-aarch64-apple-darwin && source "$0" && note_activity() { :; } && NC="" && GREEN="" && GRAY="" && rustup() { :; } && export -f rustup && check_rust_toolchains' "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" == *"Found 3 Rust toolchains"* ]]
|
||||
}
|
||||
|
||||
@test "check_rust_toolchains silent when only one toolchain" {
|
||||
run bash -c 'HOME=$(mktemp -d) && mkdir -p "$HOME/.rustup/toolchains/stable-aarch64-apple-darwin" && source "$0" && note_activity() { :; } && NC="" && GREEN="" && GRAY="" && rustup() { :; } && export -f rustup && check_rust_toolchains' "$PROJECT_ROOT/lib/clean/dev.sh"
|
||||
|
||||
[ "$status" -eq 0 ]
|
||||
[[ "$output" != *"Found"*"Rust"* ]]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user