Add xunit test.

Author: BillyONeal

azure-pipelines/end-to-end-tests-dir/ci.ps1

@@ -94,9 +94,10 @@ SUMMARY FOR $Triplet
 "@
 
 # test that features included only by skipped ports are not included
+$xunitFile = Join-Path $TestingRoot 'xunit.xml'
 Refresh-TestRoot
 Remove-Problem-Matchers
-$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-features" --binarysource=clear --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-features/baseline.txt"
+$Output = Run-VcpkgAndCaptureOutput ci @commonArgs --x-builtin-ports-root="$PSScriptRoot/../e2e-assets/ci-skipped-features" --binarysource=clear --ci-baseline="$PSScriptRoot/../e2e-assets/ci-skipped-features/baseline.txt" --x-xunit-all --x-xunit="$xunitFile"
 Restore-Problem-Matchers
 Throw-IfFailed
 if (-not ($Output -match 'skipped-features:[^:]+:      \*:' -and $Output -match 'Building skipped-features:[^@]+@1\.0\.0\.\.\.')) {
@@ -107,3 +108,36 @@ SUMMARY FOR $Triplet
   SUCCEEDED: 1
   EXCLUDED: 1
 "@
+
+$xunitContent = Get-Content $xunitFile -Raw
+$expected = @"
+<\?xml version="1\.0" encoding="utf-8"\?><assemblies>
+  <assembly name="skipped-depends" run-date="\d\d\d\d-\d\d-\d\d" run-time="\d\d:\d\d:\d\d" time="0">
+    <collection name="$Triplet" time="0">
+      <test name="skipped-depends:$Triplet" method="skipped-depends:$Triplet" time="0" result="Skip">
+        <traits>
+          <trait name="owner" value="$Triplet"/>
+        </traits>
+        <reason><!\[CDATA\[EXCLUDED\]\]></reason>
+      </test>
+    </collection>
+  </assembly>
+  <assembly name="skipped-features" run-date="\d\d\d\d-\d\d-\d\d" run-time="\d\d:\d\d:\d\d" time="0">
+    <collection name="$Triplet" time="0">
+      <test name="skipped-features:$Triplet" method="skipped-features\[core\]:$Triplet" time="0" result="Pass">
+        <traits>
+          <trait name="abi_tag" value="[^"]+"/>
+          <trait name="features" value="core"/>
+          <trait name="owner" value="$Triplet"/>
+        </traits>
+      </test>
+    </collection>
+  </assembly>
+</assemblies>
+
+"@
+
+if (-not ($xunitContent -match $expected)) {
+    Write-Diff -Actual $xunitContent -Expected $expected
+    throw 'xUnit output did not match expected output'
+}

azure-pipelines/end-to-end-tests-prelude.ps1

@@ -234,16 +234,25 @@ function Set-EmptyTestPort {
     git -C $PortsRoot status
 }
 
+function Write-Diff {
+    Param(
+        [string]$Actual,
+        [string]$Expected
+    )
+
+    Set-Content -Value $Expected -LiteralPath "$TestingRoot/expected.txt"
+    Set-Content -Value $Actual -LiteralPath "$TestingRoot/actual.txt"
+    git diff --no-index -- "$TestingRoot/expected.txt" "$TestingRoot/actual.txt"
+    Write-Stack
+}
+
 function Throw-IfNonEqual {
     Param(
         [string]$Actual,
         [string]$Expected
     )
     if ($Actual -ne $Expected) {
-        Set-Content -Value $Expected -LiteralPath "$TestingRoot/expected.txt"
-        Set-Content -Value $Actual -LiteralPath "$TestingRoot/actual.txt"
-        git diff --no-index -- "$TestingRoot/expected.txt" "$TestingRoot/actual.txt"
-        Write-Stack
+        Write-Diff -Actual $Actual -Expected $Expected
         throw "Expected '$Expected' but got '$Actual'"
     }
 }
@@ -261,10 +270,7 @@ function Throw-IfNonEndsWith {
     }
 
     if ($actualSuffix -ne $Expected) {
-        Set-Content -Value $Expected -LiteralPath "$TestingRoot/expected.txt"
-        Set-Content -Value $Actual -LiteralPath "$TestingRoot/actual.txt"
-        git diff --no-index -- "$TestingRoot/expected.txt" "$TestingRoot/actual.txt"
-        Write-Stack
+        Write-Diff -Actual $Actual -Expected $Expected
         throw "Expected '$Expected' but got '$actualSuffix'"
     }
 }
@@ -275,10 +281,7 @@ function Throw-IfContains {
         [string]$Expected
     )
     if ($Actual.Contains($Expected)) {
-        Set-Content -Value $Expected -LiteralPath "$TestingRoot/expected.txt"
-        Set-Content -Value $Actual -LiteralPath "$TestingRoot/actual.txt"
-        git diff --no-index -- "$TestingRoot/expected.txt" "$TestingRoot/actual.txt"
-        Write-Stack
+        Write-Diff -Actual $Actual -Expected $Expected
         throw "Expected '$Expected' to not be in '$Actual'"
     }
 }
@@ -289,10 +292,7 @@ function Throw-IfNonContains {
         [string]$Expected
     )
     if (-not ($Actual.Contains($Expected))) {
-        Set-Content -Value $Expected -LiteralPath "$TestingRoot/expected.txt"
-        Set-Content -Value $Actual -LiteralPath "$TestingRoot/actual.txt"
-        git diff --no-index -- "$TestingRoot/expected.txt" "$TestingRoot/actual.txt"
-        Write-Stack
+        Write-Diff -Actual $Actual -Expected $Expected
         throw "Expected '$Expected' to be in '$Actual'"
     }
 }