Enable TCPIP verifier on user mode release tests (#2074)

.azure/azure-pipelines.ci.yml

@@ -539,7 +539,7 @@ stages:
       tls: schannel
       logProfile: Full.Light
       config: Release
-      extraArgs: -SkipUnitTests -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*
+      extraArgs: -SkipUnitTests -EnableTcpipVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*
   - template: ./templates/run-bvt.yml
     parameters:
       pool: MsQuic-Win-Latest
@@ -547,7 +547,7 @@ stages:
       tls: schannel
       logProfile: Full.Light
       config: Release
-      extraArgs: -SkipUnitTests
+      extraArgs: -SkipUnitTests -EnableTcpipVerifier
 
 - stage: test_bvt_winkernel_release
   displayName: BVT Windows Kernel Release

scripts/run-gtest.ps1

@@ -47,6 +47,9 @@ as necessary.
 .Parameter EnableAppVerifier
     Enables all basic Application Verifier checks on the test binary.
 
+.Parameter EnableTcpipVerifier
+    Enables TCPIP verifier in user mode tests.
+
 .Parameter CodeCoverage
     Collects code coverage for this test run. Incompatible with -Debugger.
 
@@ -103,6 +106,9 @@ param (
     [Parameter(Mandatory = $false)]
     [switch]$EnableAppVerifier = $false,
 
+    [Parameter(Mandatory = $false)]
+    [switch]$EnableTcpipVerifier = $false,
+
     [Parameter(Mandatory = $false)]
     [switch]$CodeCoverage = $false,
 
@@ -668,7 +674,7 @@ if ($Kernel -ne "") {
     if ($LastExitCode) {
         Log ("sc.exe " + $LastExitCode)
     }
-    verifier.exe /volatile /adddriver afd.sys msquicpriv.sys msquictestpriv.sys netio.sys tcpip.sys /flags 0x9BB
+    verifier.exe /volatile /adddriver msquicpriv.sys msquictestpriv.sys /flags 0x9BB
     if ($LastExitCode) {
         Log ("verifier.exe " + $LastExitCode)
     }
@@ -678,6 +684,13 @@ if ($Kernel -ne "") {
     }
 }
 
+if ($IsWindows -and ($EnableTcpipVerifier -or $Kernel)) {
+    verifier.exe /volatile /adddriver afd.sys netio.sys tcpip.sys /flags 0x9BB
+    if ($LastExitCode) {
+        Log ("verifier.exe " + $LastExitCode)
+    }
+}
+
 try {
     if ($IsolationMode -eq "Batch") {
         # Run the the test process once for all tests.
@@ -745,7 +758,12 @@ try {
         net.exe stop msquicpriv /y | Out-Null
         sc.exe delete msquictestpriv | Out-Null
         sc.exe delete msquicpriv | Out-Null
-        verifier.exe /volatile /removedriver afd.sys msquicpriv.sys msquictestpriv.sys netio.sys tcpip.sys
+        verifier.exe /volatile /removedriver msquicpriv.sys msquictestpriv.sys
+        verifier.exe /volatile /flags 0x0
+    }
+
+    if ($IsWindows -and ($EnableTcpipVerifier -or $Kernel)) {
+        verifier.exe /volatile /removedriver afd.sys netio.sys tcpip.sys
         verifier.exe /volatile /flags 0x0
     }
 

scripts/test.ps1

@@ -138,6 +138,9 @@ param (
     [Parameter(Mandatory = $false)]
     [switch]$EnableAppVerifier = $false,
 
+    [Parameter(Mandatory = $false)]
+    [switch]$EnableTcpipVerifier = $false,
+
     [Parameter(Mandatory = $false)]
     [switch]$CodeCoverage = $false,
 
@@ -289,6 +292,9 @@ if ($NoProgress) {
 if ($EnableAppVerifier) {
     $TestArguments += " -EnableAppVerifier"
 }
+if ($EnableTcpipVerifier) {
+    $TestArguments += " -EnableTcpipVerifier"
+}
 if ($CodeCoverage) {
     $TestArguments += " -CodeCoverage"
 }