Skip to content

Commit

Permalink
Fix darwin-framework-tool build. (#27177)
Browse files Browse the repository at this point in the history
A merge conflict between #26882 and #27152 led to it not building.
  • Loading branch information
bzbarsky-apple authored and pull[bot] committed Aug 1, 2023
1 parent a285048 commit fd7ae38
Show file tree
Hide file tree
Showing 2 changed files with 117 additions and 6,905 deletions.
36 changes: 34 additions & 2 deletions examples/darwin-framework-tool/templates/tests/ciTests.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"include": "../../../../src/app/tests/suites/ciTests.json",
"disable": [
"TestIcdManagementCluster",
"Test_TC_SC_4_2",
"Test_TC_SC_5_2",
"TestClusterComplexTypes",
Expand Down Expand Up @@ -32,6 +31,39 @@
"Test_TC_ACL_2_9",
"Test_TC_ACL_2_10",
"DL_LockUnlock",
"Test_TC_TIMESYNC_1_1"
"Disabled due to using ICD Management (ICDManagement) cluster, which is provisional on Darwin for now:",
"TestIcdManagementCluster",
"Disabled due to using Time Synchronization (TimeSynchronization) cluster, which is provisional on Darwin for now:",
"Test_TC_TIMESYNC_1_1",
"Disabled due to using provisional Ceramic Filter Monitoring (CeramicFilterMonitoring) cluster:",
"Test_TC_CFREMON_1_1",
"Test_TC_CFREMON_2_1",
"Disabled due to using provisional Electrostatic Filter Monitoring (ElectrostaticFilterMonitoring) cluster:",
"Test_TC_ESFREMON_1_1",
"Test_TC_ESFREMON_2_1",
"Disabled due to using provisional Fuel Tank Monitoring (FuelTankMonitoring) cluster:",
"Test_TC_FTREMON_1_1",
"Test_TC_FTREMON_2_1",
"Disabled due to using provisional Ink Cartridge Monitoring (InkCartridgeMonitoring) cluster:",
"Test_TC_INKCREMON_1_1",
"Test_TC_INKCREMON_2_1",
"Disabled due to using provisional Ionizing Filter Monitoring (IonizingFilterMonitoring) cluster:",
"Test_TC_IONFREMON_1_1",
"Test_TC_IONFREMON_2_1",
"Disabled due to using provisional Ozone Filter Monitoring (OzoneFilterMonitoring) cluster:",
"Test_TC_OZFREMON_1_1",
"Test_TC_OZFREMON_2_1",
"Disabled due to using provisional Toner Cartridge Monitoring (TonerCartridgeMonitoring) cluster:",
"Test_TC_TCREMON_1_1",
"Test_TC_TCREMON_2_1",
"Disabled due to using provisional UV Filter Monitoring (UVFilterMonitoring) cluster:",
"Test_TC_UVFREMON_1_1",
"Test_TC_UVFREMON_2_1",
"Disabled due to using provisional Water Tank Monitoring (WaterTankMonitoring) cluster:",
"Test_TC_WTREMON_1_1",
"Test_TC_WTREMON_2_1",
"Disabled due to using provisional Zeolite Filter Monitoring (ZeoliteFilterMonitoring) cluster:",
"Test_TC_ZEOFREMON_1_1",
"Test_TC_ZEOFREMON_2_1"
]
}
Loading

0 comments on commit fd7ae38

Please sign in to comment.