Skip to content

Commit b0c9c91

Browse files
committed
Comment out checks for deprecated until spec is updated
1 parent 66e1475 commit b0c9c91

3 files changed

Lines changed: 629 additions & 592 deletions

File tree

matter/conformance/conformance_test.go

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -460,14 +460,16 @@ var conformanceTests = []conformanceTestSuite{
460460
Conformance: "AA, P",
461461
InvalidConformance: true,
462462
},
463-
{
464-
Conformance: "D",
465-
InvalidConformance: true,
466-
},
467-
{
468-
Conformance: "AA, D, [BB]",
469-
InvalidConformance: true,
470-
},
463+
/*
464+
Disabled until spec is cleared of these uses of deprecated
465+
{
466+
Conformance: "D",
467+
InvalidConformance: true,
468+
},
469+
{
470+
Conformance: "AA, D, [BB]",
471+
InvalidConformance: true,
472+
},*/
471473
{
472474
Conformance: "AA, [BB]",
473475
Tests: []conformanceTest{

matter/conformance/grammar/conformance.peg

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Input <- conf:Conformance+ EOF {
2929
}
3030
case *Deprecated:
3131
if i == 0 || i != len(cs) - 1 {
32-
return nil, fmt.Errorf("deprecation set at index %d; deprecation annotations must be the last element in a set of conformances", i)
32+
// Disabled until the spec is completely clear of D elements by themselves
33+
// return nil, fmt.Errorf("deprecation set at index %d; deprecation annotations must be the last element in a set of conformances", i)
3334
}
3435
case *Obsolete:
3536
if i != len(cs) - 1 {
@@ -68,7 +69,6 @@ Conformance <- '[' i:LogicalExpression ']' choice:Choice? ConformanceSeparator
6869
return &Disallowed{}, nil
6970
} / 'Z' ConformanceSeparator {
7071
return &Obsolete{}, nil
71-
}
7272
} / "desc" ConformanceSeparator {
7373
return &Described{}, nil
7474
} / eq:LogicalExpression ConformanceSeparator {

0 commit comments

Comments
 (0)