actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2026-01-04 17:18:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/actions/virtual-environments into v-malob/xcode

Browse Source
This commit is contained in:
Maxim Lobanov
2020-11-09 17:51:05 +03:00
parent c1a5ebfc6a 7c13be802f
commit 142bbb8e24
5 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
images/macos/tests/Java.Tests.ps1
View File

@@ -1,8 +1,6 @@
Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1"
#Java tests are disabled because Java is not working properly on macOS 11.0 yet.
$os = Get-OSVersion
function Get-NativeVersionFormat {
param($Version)
if ($Version -in "7", "8") {
@@ -11,7 +9,7 @@ function Get-NativeVersionFormat {
return $Version
}
Describe "Java" -Skip:($os.IsBigSur) {
Describe "Java" {
BeforeAll {
function Validate-JavaVersion {
param($JavaCommand, $ExpectedVersion)
@@ -37,18 +35,19 @@ Describe "Java" -Skip:($os.IsBigSur) {
"/usr/libexec/java_home -v${Version}" | Should -ReturnZeroExitCode
}
It "Version is valid" -TestCases $_ {
$javaRootPath = (Get-CommandResult "/usr/libexec/java_home -v${Version}").Output
$javaBinPath = Join-Path $javaRootPath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
if ($_.Title -ne "Default") {
It "Version is valid" -TestCases $_ {
$javaRootPath = "/Library/Java/JavaVirtualMachines/adoptopenjdk-${Title}.jdk/Contents/Home"
if ($Title -eq "7") { $javaRootPath = "/Library/Java/JavaVirtualMachines/zulu-7.jdk/Contents/Home" }
$javaBinPath = Join-Path $javaRootPath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
}
}
It "<EnvVariable>" -TestCases $_ {
$envVariablePath = Get-EnvironmentVariable $EnvVariable
$commandResult = Get-CommandResult "/usr/libexec/java_home -v${Version}"
$commandResult.ExitCode | Should -Be 0
$commandResult.Output | Should -Not -BeNullOrEmpty
$commandResult.Output | Should -Be $envVariablePath
$javaBinPath = Join-Path $envVariablePath "/bin/java"
Validate-JavaVersion -JavaCommand "$javaBinPath -version" -ExpectedVersion $Version
}
if ($_.Title -eq "Default") {

4
images/macos/tests/Python.Tests.ps1
View File

@@ -12,7 +12,7 @@ Describe "Python" {
(Get-CommandResult "python --version").Output | Should -BeLike "Python 2.*"
}
It "Python 2 is installed under /usr/local/bin" -Skip:($os.IsBigSur) {
It "Python 2 is installed under /usr/local/bin" {
Get-WhichTool "python" | Should -BeLike "/usr/local/bin*"
}
@@ -24,7 +24,7 @@ Describe "Python" {
Get-WhichTool "python3" | Should -BeLike "/usr/local/bin*"
}
It "Pip 2 is available" -Skip:($os.IsBigSur) {
It "Pip 2 is available" {
"pip --version" | Should -ReturnZeroExitCode
}