From 46869e3ee2274fbf353cb2c7d6cf36ed19e52b45 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 28 Nov 2019 10:26:40 +0100
Subject: pkg/csource: detect common mistakes in the common executor header

---
 pkg/csource/csource_test.go | 35 +++++++++++++++++++++++++++++++++++
 pkg/csource/generated.go    |  6 ++++--
 2 files changed, 39 insertions(+), 2 deletions(-)

(limited to 'pkg/csource')

diff --git a/pkg/csource/csource_test.go b/pkg/csource/csource_test.go
index 914ecaa71..162fcf788 100644
--- a/pkg/csource/csource_test.go
+++ b/pkg/csource/csource_test.go
@@ -181,3 +181,38 @@ func TestExecutorMacros(t *testing.T) {
 		}
 	}
 }
+
+func TestExecutorMistakes(t *testing.T) {
+	mistakes := map[string][]string{
+		// We strip debug() calls from the resulting C source,
+		// this breaks the following pattern. Use {} around debug() to fix.
+		"\\)\n\\t*(debug|debug_dump_data)\\(": {
+			`
+if (foo)
+	debug("foo failed");
+`, `
+	if (x + y)
+		debug_dump_data(data, len);
+`,
+		},
+	}
+	for pattern, tests := range mistakes {
+		re := regexp.MustCompile(pattern)
+		for _, test := range tests {
+			if !re.MatchString(test) {
+				t.Errorf("patter %q does not match test %q", pattern, test)
+			}
+		}
+		for _, match := range re.FindAllStringIndex(commonHeader, -1) {
+			start, end := match[0], match[1]
+			for start != 0 && commonHeader[start] != '\n' {
+				start--
+			}
+			for end != len(commonHeader) && commonHeader[end] != '\n' {
+				end++
+			}
+			t.Errorf("pattern %q matches executor source:\n%v",
+				pattern, commonHeader[start:end])
+		}
+	}
+}
diff --git a/pkg/csource/generated.go b/pkg/csource/generated.go
index d51f321ea..778a9f4d3 100644
--- a/pkg/csource/generated.go
+++ b/pkg/csource/generated.go
@@ -5610,8 +5610,9 @@ retry:
 				int fd = open(filename, O_RDONLY);
 				if (fd != -1) {
 					long flags = 0;
-					if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0)
+					if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0) {
 						debug("reset FS_XFLAG_IMMUTABLE\n");
+					}
 					close(fd);
 					continue;
 				}
@@ -5637,8 +5638,9 @@ retry:
 				int fd = open(dir, O_RDONLY);
 				if (fd != -1) {
 					long flags = 0;
-					if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0)
+					if (ioctl(fd, FS_IOC_SETFLAGS, &flags) == 0) {
 						debug("reset FS_XFLAG_IMMUTABLE\n");
+					}
 					close(fd);
 					continue;
 				}
-- 
cgit mrf-deployment