Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Internal Build Referencing Preview Features #3982

Merged
merged 1 commit into from
Dec 4, 2023
Merged

Fix Internal Build Referencing Preview Features #3982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/test/bin/quic_gtest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,6 +2117,7 @@ TEST(Misc, StreamBlockUnblockBidiConnFlowControl) {
}
}

#ifdef QUIC_PARAM_STREAM_RELIABLE_OFFSET
TEST(Misc, StreamReliableReset) {
TestLogger Logger("StreamReliableReset");
if (TestingKernelMode) {
Expand All @@ -2134,6 +2135,7 @@ TEST(Misc, StreamReliableResetMultipleSends) {
QuicTestStreamReliableResetMultipleSends();
}
}
#endif // QUIC_PARAM_STREAM_RELIABLE_OFFSET

TEST(Misc, StreamBlockUnblockUnidiConnFlowControl) {
TestLogger Logger("StreamBlockUnblockUnidiConnFlowControl");
Expand Down
2 changes: 2 additions & 0 deletions src/test/bin/winkernel/control.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,7 @@ QuicTestCtlEvtIoDeviceControl(
Params->CustomCertValidationParams.AcceptCert,
Params->CustomCertValidationParams.AsyncValidation));
break;

#ifdef QUIC_API_ENABLE_PREVIEW_FEATURES
case IOCTL_QUIC_RELIABLE_RESET_NEGOTIATION:
CXPLAT_FRE_ASSERT(Params != nullptr);
Expand All @@ -1499,6 +1500,7 @@ QuicTestCtlEvtIoDeviceControl(
Params->FeatureNegotiationParams.ServerSupport,
Params->FeatureNegotiationParams.ClientSupport));
break;

case IOCTL_QUIC_ONE_WAY_DELAY_NEGOTIATION:
CXPLAT_FRE_ASSERT(Params != nullptr);
QuicTestCtlRun(
Expand Down
3 changes: 3 additions & 0 deletions src/test/lib/ApiTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5003,6 +5003,8 @@ void QuicTestStreamParam()
TEST_EQUAL(Length, sizeof(QUIC_STREAM_STATISTICS));
}
}

#ifdef QUIC_PARAM_STREAM_RELIABLE_OFFSET
//
// QUIC_PARAM_STREAM_RELIABLE_OFFSET
// QUIC_PARAM_STREAM_RELIABLE_OFFSET_RECV
Expand Down Expand Up @@ -5071,6 +5073,7 @@ void QuicTestStreamParam()
&Buffer));
}
}
#endif // QUIC_PARAM_STREAM_RELIABLE_OFFSET
}

void
Expand Down
4 changes: 3 additions & 1 deletion src/test/lib/DataTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3336,7 +3336,7 @@ struct StreamReliableReset {
}
};


#ifdef QUIC_PARAM_STREAM_RELIABLE_OFFSET
void
QuicTestStreamReliableReset(
)
Expand Down Expand Up @@ -3410,6 +3410,7 @@ QuicTestStreamReliableReset(
TEST_TRUE(Context.ShutdownErrorCode == AbortSendShutdownErrorCode);
}
}

void
QuicTestStreamReliableResetMultipleSends(
)
Expand Down Expand Up @@ -3492,3 +3493,4 @@ QuicTestStreamReliableResetMultipleSends(
// Test Error code matches what we sent.
TEST_TRUE(Context.ShutdownErrorCode == AbortShutdownErrorCode);
}
#endif // QUIC_PARAM_STREAM_RELIABLE_OFFSET
6 changes: 6 additions & 0 deletions src/test/lib/EventTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,6 +1457,7 @@ QuicTestValidateStreamEvents9(
{
TestScopeLogger ScopeLogger(__FUNCTION__);

#ifdef QUIC_PARAM_STREAM_RELIABLE_OFFSET
MsQuicSettings Settings;
Settings.SetPeerBidiStreamCount(1).SetMinimumMtu(1280).SetMaximumMtu(1280);
Settings.SetReliableResetEnabled(true);
Expand Down Expand Up @@ -1575,6 +1576,11 @@ QuicTestValidateStreamEvents9(
TEST_TRUE(Server.Complete.WaitTimeout(1000));
} // Stream scope
} // Connections scope
#else // QUIC_PARAM_STREAM_RELIABLE_OFFSET
UNREFERENCED_PARAMETER(Registration);
UNREFERENCED_PARAMETER(Listener);
UNREFERENCED_PARAMETER(ServerLocalAddr);
#endif // QUIC_PARAM_STREAM_RELIABLE_OFFSET
}

void QuicTestValidateStreamEvents(uint32_t Test)
Expand Down
Loading