From bcc69ef934c9d14732e16551032242fa599b44e7 Mon Sep 17 00:00:00 2001 From: "Anthony G. Basile" Date: Tue, 20 Nov 2012 14:44:47 -0500 Subject: Reintroduce keymaps build and test This commit reintroduces code to 1) build src/keymap 2) test keymap/Makefile.am that it has all the key maps listed 3) test that all the key names in keymap/* are in 4) do a syntax check on rules/*.rules which now includes 95-keymap.rules and 95-keyboard-force-release.rules For #4, the regex expressions in rule-syntax-check.py had to be updated. They do not allow trailing comments via # comment, and I did not include that. A rule in 95-keymap.rules had to have its comment moved from the end to another line. Signed-off-by: Anthony G. Basile --- test/rule-syntax-check.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/rule-syntax-check.py') diff --git a/test/rule-syntax-check.py b/test/rule-syntax-check.py index 4b602a925a..9a0db2501f 100755 --- a/test/rule-syntax-check.py +++ b/test/rule-syntax-check.py @@ -28,7 +28,7 @@ if len(sys.argv) < 2: no_args_tests = re.compile('(ACTION|DEVPATH|KERNELS?|NAME|SYMLINK|SUBSYSTEMS?|DRIVERS?|TAG|RESULT|TEST)\s*(?:=|!)=\s*"([^"]*)"$') args_tests = re.compile('(ATTRS?|ENV|TEST){([a-zA-Z0-9/_.*%-]+)}\s*(?:=|!)=\s*"([^"]*)"$') no_args_assign = re.compile('(NAME|SYMLINK|OWNER|GROUP|MODE|TAG|PROGRAM|RUN|LABEL|GOTO|WAIT_FOR|OPTIONS|IMPORT)\s*(?:\+=|:=|=)\s*"([^"]*)"$') -args_assign = re.compile('(ATTR|ENV|IMPORT|RUN){([a-zA-Z0-9/_.*%-]+)}\s*(=|\+=)\s*"([^"]*)"$') +args_assign = re.compile('(ATTR|ENV|IMPORT|RUN){([][a-zA-Z0-9/_.*%-]+)}\s*(=|==|\+=)\s*"([^"]*)"$') result = 0 buffer = '' -- cgit v1.2.3-54-g00ecf