Skip to content

Commit

Permalink
Backport Infra and Test Fixes to release/2.1 (#3087)
Browse files Browse the repository at this point in the history
  • Loading branch information
nibanks authored Sep 27, 2022
1 parent 51cd036 commit 2dee354
Show file tree
Hide file tree
Showing 13 changed files with 31 additions and 27 deletions.
8 changes: 4 additions & 4 deletions .azure/azure-pipelines.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -527,15 +527,15 @@ stages:
tls: schannel
logProfile: Full.Light
config: Release
extraTestArgs: -SkipUnitTests -EnableTcpipVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*
extraTestArgs: -SkipUnitTests -EnableSystemVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ConnectClientCertificate*
- template: ./templates/run-bvt.yml
parameters:
pool: MsQuic-Win-Latest
platform: windows
tls: schannel
logProfile: Full.Light
config: Release
extraTestArgs: -SkipUnitTests -EnableTcpipVerifier
extraTestArgs: -SkipUnitTests
- template: ./templates/run-bvt.yml
parameters:
image: ubuntu-latest
Expand All @@ -558,7 +558,7 @@ stages:
logProfile: Full.Light
config: Release
kernel: true
extraTestArgs: -Kernel -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*
extraTestArgs: -Kernel -EnableSystemVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*
- template: ./templates/run-bvt.yml
parameters:
pool: MsQuic-Win-Latest
Expand All @@ -585,7 +585,7 @@ stages:
platform: windows
tls: schannel
logProfile: Full.Light
extraTestArgs: -Kernel -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*:*NthAllocFail*
extraTestArgs: -Kernel -EnableSystemVerifier -Filter -*ValidateConfiguration:*ValidAlpnLengths:*ResumeRejection*:*ClientCertificate*:*LoadBalanced*:*NthAllocFail*
kernel: true
- template: ./templates/run-bvt.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion .azure/obtemplates/push-vpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
vpackToken: $(VPACK_PAT)
majorVer: 2
minorVer: 1
patchVer: 1
patchVer: 2
prereleaseVer: $(Build.BuildId)

- publish: $(XES_VPACKMANIFESTDIRECTORY)
Expand Down
2 changes: 1 addition & 1 deletion .azure/templates/test-distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
sudo apt-add-repository ppa:lttng/stable-2.12
sudo apt-get update
sudo apt-get install -y lttng-tools
sudo dpkg -i $(Build.SourcesDirectory)/distribution/libmsquic_2.1.1_amd64.deb
sudo dpkg -i $(Build.SourcesDirectory)/distribution/libmsquic_2.1.2_amd64.deb
- pwsh: |
chmod +x $(Build.SourcesDirectory)/artifacts/bin/linux/x64_Release_openssl/msquictest
$(Build.SourcesDirectory)/artifacts/bin/linux/x64_Release_openssl/msquictest --gtest_filter=ParameterValidation.ValidateApi
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ message(STATUS "Platform version: ${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")

set(QUIC_MAJOR_VERSION 2)
set(QUIC_FULL_VERSION 2.1.1)
set(QUIC_FULL_VERSION 2.1.2)

if (WIN32)
set(CX_PLATFORM "windows")
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "msquic"
version = "2.1.1-beta"
version = "2.1.2-beta"
edition = "2018"
authors = ["Microsoft"]
description = "Microsoft implementation of the IETF QUIC protocol"
Expand Down
2 changes: 1 addition & 1 deletion scripts/package-distribution.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ $ArtifactsBinDir = Join-Path $BaseArtifactsDir "bin"
# All direct subfolders are OS's
$Platforms = Get-ChildItem -Path $ArtifactsBinDir

$Version = "2.1.1"
$Version = "2.1.2"

$WindowsBuilds = @()
$AllBuilds = @()
Expand Down
2 changes: 1 addition & 1 deletion scripts/package-nuget.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ $DistDir = Join-Path $BaseArtifactsDir "dist"
$CurrentCommitHash = Get-GitHash -RepoDir $RootDir
$RepoRemote = Get-GitRemote -RepoDir $RootDir

$Version = "2.1.1"
$Version = "2.1.2"

$BuildId = $env:BUILD_BUILDID
if ($null -ne $BuildId) {
Expand Down
24 changes: 14 additions & 10 deletions scripts/run-gtest.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ as necessary.
.Parameter EnableAppVerifier
Enables all basic Application Verifier checks on the test binary.
.Parameter EnableTcpipVerifier
.Parameter EnableSystemVerifier
Enables TCPIP verifier in user mode tests.
.Parameter CodeCoverage
Expand Down Expand Up @@ -110,7 +110,7 @@ param (
[switch]$EnableAppVerifier = $false,

[Parameter(Mandatory = $false)]
[switch]$EnableTcpipVerifier = $false,
[switch]$EnableSystemVerifier = $false,

[Parameter(Mandatory = $false)]
[switch]$CodeCoverage = $false,
Expand Down Expand Up @@ -299,7 +299,7 @@ function Start-TestExecutable([String]$Arguments, [String]$OutputDir) {
$pinfo = New-Object System.Diagnostics.ProcessStartInfo
if ($IsWindows) {
if ($Debugger) {
$pinfo.FileName = "windbg"
$pinfo.FileName = "windbgx"
if ($InitialBreak) {
$pinfo.Arguments = "-G $($Path) $($Arguments)"
} else {
Expand Down Expand Up @@ -767,17 +767,19 @@ if ($Kernel -ne "") {
if ($LastExitCode) {
Log ("sc.exe " + $LastExitCode)
}
verifier.exe /volatile /adddriver msquicpriv.sys msquictestpriv.sys /flags 0x9BB
if ($LastExitCode) {
Log ("verifier.exe " + $LastExitCode)
if ($EnableSystemVerifier) {
verifier.exe /volatile /adddriver msquicpriv.sys msquictestpriv.sys /flags 0x9BB
if ($LastExitCode) {
Log ("verifier.exe " + $LastExitCode)
}
}
net.exe start msquicpriv
if ($LastExitCode) {
Log ("net.exe " + $LastExitCode)
}
}

if ($IsWindows -and ($EnableTcpipVerifier -or $Kernel)) {
if ($IsWindows -and $EnableSystemVerifier) {
verifier.exe /volatile /adddriver afd.sys netio.sys tcpip.sys /flags 0x9BB
if ($LastExitCode) {
Log ("verifier.exe " + $LastExitCode)
Expand Down Expand Up @@ -851,11 +853,13 @@ try {
net.exe stop msquicpriv /y | Out-Null
sc.exe delete msquictestpriv | Out-Null
sc.exe delete msquicpriv | Out-Null
verifier.exe /volatile /removedriver msquicpriv.sys msquictestpriv.sys
verifier.exe /volatile /flags 0x0
}

if ($IsWindows -and ($EnableTcpipVerifier -or $Kernel)) {
if ($IsWindows -and $EnableSystemVerifier) {
if ($Kernel -ne "") {
verifier.exe /volatile /removedriver msquicpriv.sys msquictestpriv.sys
verifier.exe /volatile /flags 0x0
}
verifier.exe /volatile /removedriver afd.sys netio.sys tcpip.sys
verifier.exe /volatile /flags 0x0
}
Expand Down
6 changes: 3 additions & 3 deletions scripts/test.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ param (
[switch]$EnableAppVerifier = $false,

[Parameter(Mandatory = $false)]
[switch]$EnableTcpipVerifier = $false,
[switch]$EnableSystemVerifier = $false,

[Parameter(Mandatory = $false)]
[switch]$CodeCoverage = $false,
Expand Down Expand Up @@ -301,8 +301,8 @@ if ($NoProgress) {
if ($EnableAppVerifier) {
$TestArguments += " -EnableAppVerifier"
}
if ($EnableTcpipVerifier) {
$TestArguments += " -EnableTcpipVerifier"
if ($EnableSystemVerifier) {
$TestArguments += " -EnableSystemVerifier"
}
if ($CodeCoverage) {
$TestArguments += " -CodeCoverage"
Expand Down
2 changes: 1 addition & 1 deletion scripts/write-versions.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $ArtifactsDir = $BuildConfig.ArtifactsDir
$SourceVersion = $env:BUILD_SOURCEVERSION;
$SourceBranch = $env:BUILD_SOURCEBRANCH;
$BuildId = $env:BUILD_BUILDID;
$VersionNumber = "2.1.1";
$VersionNumber = "2.1.2";

class BuildData {
[string]$SourceVersion;
Expand Down
2 changes: 1 addition & 1 deletion src/distribution/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleVersion</key>
<string>2.1.1</string>
<string>2.1.2</string>
<key>NSHumanReadableCopyright</key>
<string>MIT</string>
<key>CFBundleGetInfoString</key>
Expand Down
2 changes: 1 addition & 1 deletion src/inc/msquic.ver
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#endif

#ifndef VER_PATCH
#define VER_PATCH 1
#define VER_PATCH 2
#endif

#ifndef VER_BUILD_ID
Expand Down
2 changes: 1 addition & 1 deletion src/inc/msquicp.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ typedef struct QUIC_TEST_DATAPATH_HOOKS {
#endif

typedef struct QUIC_PRIVATE_TRANSPORT_PARAMETER {
uint16_t Type;
uint32_t Type;
uint16_t Length;
_Field_size_(Length)
const uint8_t* Buffer;
Expand Down

0 comments on commit 2dee354

Please sign in to comment.