Skip to content

Commit aaffc67

Browse files
authored
Merge pull request #108 from tSQLt-org/FixFailedToReadTestResultXml
Fix failed to read test result xml
2 parents ae4c16e + 14ce559 commit aaffc67

10 files changed

Lines changed: 16 additions & 567 deletions

.github/workflows/build_and_test_on_spawn.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ name: Build and Test tSQLt on Spawn
77
on:
88
push:
99
branches:
10-
- tSQLtFacadeBuild
10+
- main
11+
pull_request:
1112
workflow_dispatch:
1213
inputs:
1314
spawnDataImages:

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,3 +27,4 @@
2727
/tSQLtCLR/OfficialSigningKey/KeyInfo.txt
2828
/tSQLtCLR/OfficialSigningKey/KeyInfoC.txt
2929

30+
.vscode/settings.json

Build/FacadeValidate.ps1

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ $FriendlySQLServerVersion = Get-FriendlySQLServerVersion -ServerName $ServerName
3434
$FacadeFileName = $TempPath + "/tSQLt/FacadeDacpacs/tSQLtFacade."+$FriendlySQLServerVersion+".dacpac";
3535

3636
$DacpacDatabaseName = $DatabaseName+"_dacpac";
37-
$AdditionalParameters = '-v NewDbName="'+$DacpacDatabaseName+'"';
38-
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -FileNames "CreateBuildDb.sql" -DatabaseName 'tempdb' -AdditionalParameters $AdditionalParameters;
37+
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -FileNames "CreateBuildDb.sql" -DatabaseName 'tempdb' -AdditionalParameters ('-v NewDbName="'+$DacpacDatabaseName+'"');
3938

4039
$SqlConnectionString = Get-SqlConnectionString -ServerName $ServerNameTrimmed -Login $LoginTrimmed -DatabaseName $DacpacDatabaseName;
4140
& "$SqlPackagePath/sqlpackage.exe" /a:Publish /tcs:"$SqlConnectionString" /sf:"$FacadeFileName"
@@ -55,9 +54,9 @@ Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdP
5554
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -Query "EXEC tSQLt_testutil.PrepMultiRunLogTable;EXEC tSQLt.SetSummaryError @SummaryError=0;" -DatabaseName $SourceDatabaseName -AdditionalParameters $AdditionalParameters;
5655
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -Query "EXEC tSQLt.RunAll;" -DatabaseName $SourceDatabaseName -AdditionalParameters $AdditionalParameters;
5756
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -Query "EXEC tSQLt_testutil.LogMultiRunResult 'DeployFacadeTests.sql';" -DatabaseName $SourceDatabaseName -AdditionalParameters $AdditionalParameters;
58-
$AdditionalParameters = '-o "'+$TestResultsPath+'"';
59-
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -FileNames "GetTestResults.sql" -DatabaseName $SourceDatabaseName -AdditionalParameters $AdditionalParameters;
60-
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -Query "EXEC tSQLt.SetSummaryError @SummaryError=1;EXEC tSQLt_testutil.CheckMultiRunResults @noError=1;EXEC tSQLt_testutil.StoreBuildLog @TableName='$LogTableName',@RunGroup='Facade';" -DatabaseName $SourceDatabaseName -AdditionalParameters $AdditionalParameters;
57+
58+
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -FileNames "GetTestResults.sql" -DatabaseName $SourceDatabaseName -AdditionalParameters ('-o "'+$TestResultsPath+'"');
59+
Exec-SqlFileOrQuery -ServerName $ServerNameTrimmed -Login $LoginTrimmed -SqlCmdPath $SqlCmdPath -Query "EXEC tSQLt.SetSummaryError @SummaryError=1;EXEC tSQLt_testutil.CheckMultiRunResults @noError=1;EXEC tSQLt_testutil.StoreBuildLog @TableName='$LogTableName',@RunGroup='Facade';" -DatabaseName $SourceDatabaseName;
6160

6261
Pop-Location;
6362

CI/Azure-DevOps/AZ_BuildtSQLt.yml

Lines changed: 0 additions & 132 deletions
This file was deleted.

CI/Azure-DevOps/AZ_CreateSQLVM.yml

Lines changed: 0 additions & 132 deletions
This file was deleted.

CI/Azure-DevOps/AZ_MainPipeline.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ variables:
5050
value: $(Pipeline.Workspace)\$(TSQLT_REPO_DIR)\Build\output\tSQLt\public
5151
- name: TSQLT_VALIDATION_ARTIFACT_DIR
5252
value: $(Pipeline.Workspace)\$(TSQLT_REPO_DIR)\Build\output\tSQLt\validation
53+
- name: TSQLT_TEST_RESULTS_ARTIFACT_DIR
54+
value: $(Pipeline.Workspace)\$(TSQLT_REPO_DIR)\Build\output\tSQLt\validation\TestResults
5355
- name: SQLCMDPath
5456
# value: 'C:\Program Files\Microsoft SQL Server\110\Tools\Binn' for vmImage: 'vs2017-win2016'
5557
value: 'C:\Program Files\Microsoft SQL Server\Client SDK\ODBC\170\Tools\Binn'
@@ -578,6 +580,13 @@ stages:
578580
#buildConfiguration: # Optional
579581
publishRunAttachments: true # Optional
580582

583+
- task: PublishPipelineArtifact@1
584+
name: PublishValidateOutputArtifact
585+
inputs:
586+
targetPath: '$(Pipeline.Workspace)/tSQLt/Build/output/Validate'
587+
artifact: 'ValidateOutput_$(System.JobName)'
588+
publishLocation: 'pipeline'
589+
581590

582591
- task: PowerShell@2
583592
name: TagArtifact

CI/Azure-DevOps/AZ_ValidateARMTemplates.yml

Lines changed: 0 additions & 63 deletions
This file was deleted.

0 commit comments

Comments
 (0)