diff --git a/images/macos/provision/core/codeql-bundle.sh b/images/macos/provision/core/codeql-bundle.sh index 1b6e2c405..1677363cf 100644 --- a/images/macos/provision/core/codeql-bundle.sh +++ b/images/macos/provision/core/codeql-bundle.sh @@ -21,3 +21,5 @@ touch "$codeqlToolcachePath/pinned-version" # Touch a file to indicate to the toolcache that setting up CodeQL is complete. touch "$codeqlToolcachePath.complete" + +invoke_tests "Common" "CodeQL" diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1 index bd1ab630e..aa5a9db45 100644 --- a/images/macos/tests/Common.Tests.ps1 +++ b/images/macos/tests/Common.Tests.ps1 @@ -139,11 +139,14 @@ Describe "VirtualBox" -Skip:($os.IsBigSur) { } } -Describe "CodeQL Action Bundle" { +Describe "CodeQL" { It "codeql" { $CodeQLVersionWildcard = Join-Path $Env:AGENT_TOOLSDIRECTORY -ChildPath "CodeQL" | Join-Path -ChildPath "*" $CodeQLVersionPath = Get-ChildItem $CodeQLVersionWildcard | Select-Object -First 1 -Expand FullName $CodeQLPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "codeql" "$CodeQLPath version --quiet" | Should -ReturnZeroExitCode + + $CodeQLPacksPath = Join-Path $CodeQLVersionPath -ChildPath "x64" | Join-Path -ChildPath "codeql" | Join-Path -ChildPath "qlpacks" + $CodeQLPacksPath | Should -Exist } } \ No newline at end of file