Fix running tests locally and in CI.

tristanlabelle · Dec 14, 2023 · 335153e · 335153e
1 parent ed218f6
commit 335153e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -44,12 +44,17 @@ jobs:
       shell: pwsh
       run: swift test --verbose --skip-build
 
+    - name: Build Test WinRT Component
+      working-directory: InteropTests
+      shell: pwsh
+      run: '& .\BuildWinRTComponent.ps1'
+
     - name: Build InteropTests
       working-directory: InteropTests
       shell: pwsh
-      run: '& .\Build.ps1'
+      run: swift build --verbose --build-tests
 
     - name: Run InteropTests
       working-directory: InteropTests
       shell: pwsh
-      run: '& .\Run.ps1'
+      run: swift test --verbose --skip-build
diff --git a/InteropTests/BuildWinRTComponent.ps1 b/InteropTests/BuildWinRTComponent.ps1
@@ -43,5 +43,5 @@ Copy-Item -Path "$PSScriptRoot\GeneratedPackage.swift" -Destination "$PSScriptRo
 
 Write-Host -ForegroundColor Cyan "Copying the WinRT component dll next to the test..."
 $SwiftTestPackageDir = $PSScriptRoot
-$SwiftTestBuildOutputDir = "$SwiftTestPackageDir\.build\$SwiftConfiguration"
+$SwiftTestBuildOutputDir = "$SwiftTestPackageDir\.build\x86_64-unknown-windows-msvc\$SwiftConfiguration\"
 Copy-Item -Path $TestComponentDir\WinRTComponent.dll -Destination $SwiftTestBuildOutputDir -Force