summaryrefslogtreecommitdiff
path: root/t/t4018/dts-nodes-boolean-prop
diff options
context:
space:
mode:
authorLibravatar Stephen Boyd <sboyd@kernel.org>2019-10-20 11:52:30 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-10-21 17:44:12 +0900
commit8da56a484800023a545d7a7c022473f5aa9e720f (patch)
treee4feb0d793512ff670339b210a12346fade094db /t/t4018/dts-nodes-boolean-prop
parentuserdiff: add a builtin pattern for dts files (diff)
downloadtgif-8da56a484800023a545d7a7c022473f5aa9e720f.tar.xz
userdiff: fix some corner cases in dts regex
While reviewing some dts diffs recently I noticed that the hunk header logic was failing to find the containing node. This is because the regex doesn't consider properties that may span multiple lines, i.e. property = <something>, <something_else>; and it got hung up on comments inside nodes that look like the root node because they start with '/*'. Add tests for these cases and update the regex to find them. Maybe detecting the root node is too complicated but forcing it to be a backslash with any amount of whitespace up to an open bracket seemed OK. I tried to detect that a comment is in-between the two parts but I wasn't happy so I just dropped it. Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Signed-off-by: Stephen Boyd <sboyd@kernel.org> Reviewed-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4018/dts-nodes-boolean-prop')
-rw-r--r--t/t4018/dts-nodes-boolean-prop9
1 files changed, 9 insertions, 0 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;
+ };
+ };
+};