Skip to content

Commit 9d53d1e

Browse files
Merge remote-tracking branch 'origin/main' into distro_cli_2.1_reprovision
2 parents 3386d09 + 9894d84 commit 9d53d1e

253 files changed

Lines changed: 57447 additions & 43927 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 292987313524f3af49188eb386838828b9f32e5a
1+
Subproject commit 11cda04a7d26285535bca183c96c720bb2ac5713
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit aa51a38945bf589236bc160f7932826ece81a60e
1+
Subproject commit b9f452b9591e067e71ee41fd0ce8ceaa1d6891b9
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 5363868d7e7c49260981f59564c53531d1a1e2bf
1+
Subproject commit 9edbfd7942daf6e6ed00878e302b8573458c7da7
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 155e9ba009f9edd070bc4f72c8ef8b712b335333
1+
Subproject commit c06d4e5728b1ded0181a51c9299f0dc5bbd35e8c
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit 671025e3e97c7d530419ff9b75cb034520832af2
1+
Subproject commit e5a40a420ab72fd46e3f47f0cdbef253d784576d
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Subproject commit a9b06eb31307f7f09e89d028e39ac49fe46b684b
1+
Subproject commit f0899557973965759714e3f110c9435d5c5f9569

‎build/fbcode_builder/getdeps/builder.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,11 @@ def __init__(
481481
inst_dir,
482482
)
483483
self.args: list[str] = args or []
484-
if not build_opts.shared_libs and "--disable-shared" not in self.args:
484+
if (
485+
not build_opts.shared_libs
486+
and "--disable-shared" not in self.args
487+
and "--enable-shared" not in self.args
488+
):
485489
self.args.append("--disable-shared")
486490
self.conf_env_args: dict[str, list[str]] = conf_env_args or {}
487491

‎build/fbcode_builder/manifests/proxygen-python‎

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

‎cmake/AgentHwTest.cmake‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -224,26 +224,19 @@ set(hw_switch_test_srcs
224224
fboss/agent/hw/test/HwTestCoppUtils.cpp
225225
fboss/agent/hw/test/HwRouteTests.cpp
226226
fboss/agent/hw/test/HwSplitAgentTest.cpp
227-
fboss/agent/hw/test/HwTrunkTests.cpp
228227
fboss/agent/hw/test/HwVlanTests.cpp
229228
fboss/agent/hw/test/HwVerifyPfcConfigInHwTest.cpp
230229
fboss/agent/hw/test/HwAclStatTests.cpp
231230
fboss/agent/hw/test/HwPortProfileTests.cpp
232231
fboss/agent/hw/test/HwPortStressTests.cpp
233-
fboss/agent/hw/test/HwSwitchStateReplayTest.cpp
234-
fboss/agent/hw/test/HwPtpTcTests.cpp
235-
fboss/agent/hw/test/HwTeFlowTestUtils.cpp
236-
fboss/agent/hw/test/HwTeFlowTests.cpp
237232
fboss/agent/hw/test/HwTestPfcUtils.cpp
238233
fboss/agent/hw/test/HwEmptyTest.cpp
239234
fboss/agent/hw/test/dataplane_tests/HwHashConsistencyTest.cpp
240235
fboss/agent/hw/test/dataplane_tests/HwInPauseDiscardsTests.cpp
241236
fboss/agent/hw/test/dataplane_tests/HwL3Tests.cpp
242237
fboss/agent/hw/test/dataplane_tests/HwLoadBalancerTests.cpp
243-
fboss/agent/hw/test/dataplane_tests/HwTeFlowTrafficTests.cpp
244238
fboss/agent/hw/test/dataplane_tests/HwProdInvariantHelper.cpp
245239
fboss/agent/hw/test/dataplane_tests/HwProdInvariantTests.cpp
246-
fboss/agent/hw/test/dataplane_tests/HwPacketSendTests.cpp
247240
fboss/agent/hw/test/dataplane_tests/HwSflowTests.cpp
248241
fboss/agent/hw/test/dataplane_tests/HwTestAqmUtils.cpp
249242
fboss/agent/hw/test/dataplane_tests/HwTestQosUtils.cpp

‎cmake/AgentTestAgentHwTests.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ add_library(agent_hw_test_src
160160
fboss/agent/test/agent_hw_tests/AgentRouteOverflowTests.cpp
161161
fboss/agent/test/agent_hw_tests/AgentRollbackTests.cpp
162162
fboss/agent/test/agent_hw_tests/AgentRouteRollbackTests.cpp
163+
fboss/agent/test/agent_hw_tests/AgentPacketStreamHandlerTests.cpp
163164
)
164165

165166
target_link_libraries(agent_hw_test_src

0 commit comments

Comments
 (0)