From 2b76e37ce48a16e28b2eff5ff648cf54c97c73da Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Fri, 25 Jun 2021 15:32:46 +0300 Subject: [PATCH] fix context --- images/linux/scripts/tests/Android.Tests.ps1 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/images/linux/scripts/tests/Android.Tests.ps1 b/images/linux/scripts/tests/Android.Tests.ps1 index 64b13c916df5..2aa933660c7a 100644 --- a/images/linux/scripts/tests/Android.Tests.ps1 +++ b/images/linux/scripts/tests/Android.Tests.ps1 @@ -51,14 +51,16 @@ Describe "Android" { } Context "SDKManagers" { + $toolsSdkman = Join-Path $ANDROID_SDK_DIR "/tools" "bin" "sdkmanager" + $cmdlineSdkman = Join-Path $ANDROID_SDK_DIR "/cmdline-tools" "latest" "bin" "sdkmanager" $testCases = @( @{ PackageName = "SDK tools" - Sdkmanager = "$ANDROID_SDK_DIR/tools/bin/sdkmanager" + Sdkmanager = $toolsSdkman }, @{ PackageName = "Command-line tools" - Sdkmanager = "$ANDROID_SDK_DIR/cmdline-tools/latest/bin/sdkmanager" + Sdkmanager = $cmdlineSdkman } )