diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:10 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:10 +0900 |
| commit | 2e215b7959a895d6aadbb828622bef966738ed6a (patch) | |
| tree | b74c6ac48f68f18c5188e0b3d2aa081cf0e75c38 /t/t4018 | |
| parent | Merge branch 'sg/progress-fix' (diff) | |
| parent | userdiff: fix some corner cases in dts regex (diff) | |
| download | tgif-2e215b7959a895d6aadbb828622bef966738ed6a.tar.xz | |
Merge branch 'sb/userdiff-dts'
Tweak userdiff patterns for dts.
* sb/userdiff-dts:
userdiff: fix some corner cases in dts regex
Diffstat (limited to 't/t4018')
| -rw-r--r-- | t/t4018/dts-nodes-boolean-prop | 9 | ||||
| -rw-r--r-- | t/t4018/dts-nodes-multiline-prop | 13 | ||||
| -rw-r--r-- | t/t4018/dts-root | 2 | ||||
| -rw-r--r-- | t/t4018/dts-root-comment | 8 |
4 files changed, 31 insertions, 1 deletions
diff --git a/t/t4018/dts-nodes-boolean-prop b/t/t4018/dts-nodes-boolean-prop new file mode 100644 index 0000000000..afc6b5b404 --- /dev/null +++ b/t/t4018/dts-nodes-boolean-prop @@ -0,0 +1,9 @@ +/ { + label_1: node1@ff00 { + RIGHT@deadf00,4000 { + boolean-prop1; + + ChangeMe; + }; + }; +}; diff --git a/t/t4018/dts-nodes-multiline-prop b/t/t4018/dts-nodes-multiline-prop new file mode 100644 index 0000000000..072d58b69d --- /dev/null +++ b/t/t4018/dts-nodes-multiline-prop @@ -0,0 +1,13 @@ +/ { + label_1: node1@ff00 { + RIGHT@deadf00,4000 { + multilineprop = <3>, + <4>, + <5>, + <6>, + <7>; + + ChangeMe = <0xffeedd00>; + }; + }; +}; diff --git a/t/t4018/dts-root b/t/t4018/dts-root index 2ef9e6ffaa..4353b8220c 100644 --- a/t/t4018/dts-root +++ b/t/t4018/dts-root @@ -1,4 +1,4 @@ -/RIGHT { /* Technically just supposed to be a slash */ +/ { RIGHT /* Technically just supposed to be a slash and brace */ #size-cells = <1>; ChangeMe = <0xffeedd00>; diff --git a/t/t4018/dts-root-comment b/t/t4018/dts-root-comment new file mode 100644 index 0000000000..333a625c70 --- /dev/null +++ b/t/t4018/dts-root-comment @@ -0,0 +1,8 @@ +/ { RIGHT /* Technically just supposed to be a slash and brace */ + #size-cells = <1>; + + /* This comment should be ignored */ + + some-property = <40+2>; + ChangeMe = <0xffeedd00>; +}; |