fixup! Enable static instrumentation

dotnet · Jun 19, 2023 · e63ecd7 · e63ecd7
1 parent f808abc
commit e63ecd7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -155,6 +155,7 @@ stages:
 
         variables:
           - _buildScript: $(Build.SourcesDirectory)/build.cmd -ci -NativeToolsOnMachine
+          - _testScript: $(Build.SourcesDirectory)/eng/common/build.ps1 -ci -NativeToolsOnMachine
 
         preSteps:
           - checkout: self
@@ -166,6 +167,7 @@ stages:
           - template: \eng\pipelines\templates\BuildAndTest.yml
             parameters:
               buildScript: $(_buildScript)
+              testScript: $(_testScript)
               buildConfig: $(_BuildConfig)
               repoLogPath: $(Build.Arcade.LogsPath)
               repoTestResultsPath: $(Build.Arcade.TestResultsPath)
@@ -189,6 +191,7 @@ stages:
 
         variables:
           - _buildScript: $(Build.SourcesDirectory)/build.sh --ci
+          - _testScript: $(Build.SourcesDirectory)/eng/common/build.sh --ci --test --include-files $(Build.Arcade.ArtifactsPath)bin/
 
         preSteps:
           - checkout: self
@@ -200,6 +203,7 @@ stages:
           - template: \eng\pipelines\templates\BuildAndTest.yml
             parameters:
               buildScript: $(_buildScript)
+              testScript: $(_testScript)
               buildConfig: $(_BuildConfig)
               repoLogPath: $(Build.Arcade.LogsPath)
               repoTestResultsPath: $(Build.Arcade.TestResultsPath)
@@ -249,6 +253,7 @@ stages:
           - template: \eng\pipelines\templates\BuildAndTest.yml
             parameters:
               buildScript: $(_buildScript)
+              testScript: ''
               buildConfig: $(_BuildConfig)
               repoLogPath: $(Build.Arcade.LogsPath)
               repoTestResultsPath: $(Build.Arcade.TestResultsPath)

diff --git a/eng/pipelines/templates/BuildAndTest.yml b/eng/pipelines/templates/BuildAndTest.yml
@@ -1,6 +1,8 @@
 parameters:
   - name: buildScript
     type: string
+  - name: testScript
+    type: string
   - name: buildConfig
     type: string
   - name: repoLogPath
@@ -63,7 +65,7 @@ steps:
     - script: $(Build.SourcesDirectory)/.dotnet/dotnet dotnet-coverage collect
               --settings $(Build.SourcesDirectory)/eng/CodeCoverage.config
               --output ${{ parameters.repoTestResultsPath }}
-              "${{ parameters.buildScript }} -test -configuration ${{ parameters.buildConfig }} /bl:${{ parameters.repoLogPath }}/tests.binlog $(_OfficialBuildIdArgs)"
+              "${{ parameters.testScript }} -configuration ${{ parameters.buildConfig }} /bl:${{ parameters.repoLogPath }}/tests.binlog $(_OfficialBuildIdArgs)"
       displayName: Run tests
 
     - pwsh: |