[macOS] Fix Gradle test (#8543)

Alexey-Ayupov · web-flow · commit 15a60352c01b · 2023-10-12T20:38:12.000+02:00
diff --git a/images/macos/provision/core/openjdk.sh b/images/macos/provision/core/openjdk.sh
@@ -70,7 +70,6 @@ installOpenJDK() {
 }
 
 arch=$(get_arch)
-echo $arch
 defaultVersion=$(get_toolset_value '.java.'$arch'.default')
 jdkVersionsToInstall=($(get_toolset_value ".java.${arch}.versions[]"))
 
diff --git a/images/macos/tests/Java.Tests.ps1 b/images/macos/tests/Java.Tests.ps1
@@ -75,7 +75,7 @@ Describe "Java" {
                 (Get-Command "gradle").Path | Should -BeExactly "/usr/local/bin/gradle"
             }
 
-            It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:($os.IsVentura)  {
+            It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:(-not $os.IsVenturaArm64)  {
                 (Get-Command "gradle").Path | Should -BeExactly "/opt/homebrew/bin/gradle"
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,6 @@ installOpenJDK() {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`arch=$(get_arch)`
`73`		`-echo $arch`
`74`	`73`	`defaultVersion=$(get_toolset_value '.java.'$arch'.default')`
`75`	`74`	`jdkVersionsToInstall=($(get_toolset_value ".java.${arch}.versions[]"))`
`76`	`75`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ Describe "Java" {`
`75`	`75`	`(Get-Command "gradle").Path \| Should -BeExactly "/usr/local/bin/gradle"`
`76`	`76`	`}`
`77`	`77`
`78`		`- It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:($os.IsVentura) {`
	`78`	`+ It "Gradle is installed to /opt/homebrew/bin/gradle" -Skip:(-not $os.IsVenturaArm64) {`
`79`	`79`	`(Get-Command "gradle").Path \| Should -BeExactly "/opt/homebrew/bin/gradle"`
`80`	`80`	`}`
`81`	`81`	`}`