From 45cec93e99d04e9c523908a640e9972f05fea1a8 Mon Sep 17 00:00:00 2001 From: Matt Clay Date: Mon, 27 Feb 2017 21:16:26 -0800 Subject: [PATCH] Disable newer shellcheck tests which don't pass. --- test/runner/lib/executor.py | 5 ++++- test/sanity/shellcheck/exclude.txt | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 test/sanity/shellcheck/exclude.txt diff --git a/test/runner/lib/executor.py b/test/runner/lib/executor.py index 82e41b7822d..ff12d712565 100644 --- a/test/runner/lib/executor.py +++ b/test/runner/lib/executor.py @@ -816,13 +816,16 @@ def command_sanity_shellcheck(args, targets): with open('test/sanity/shellcheck/skip.txt', 'r') as skip_fd: skip_paths = set(skip_fd.read().splitlines()) + with open('test/sanity/shellcheck/exclude.txt', 'r') as exclude_fd: + exclude = set(exclude_fd.read().splitlines()) + paths = sorted(i.path for i in targets.include if os.path.splitext(i.path)[1] == '.sh' and i.path not in skip_paths) if not paths: display.info('No tests applicable.', verbosity=1) return - run_command(args, ['shellcheck'] + paths) + run_command(args, ['shellcheck', '-e', ','.join(sorted(exclude))] + paths) def command_sanity_pep8(args, targets): diff --git a/test/sanity/shellcheck/exclude.txt b/test/sanity/shellcheck/exclude.txt new file mode 100644 index 00000000000..b06ec7adbcb --- /dev/null +++ b/test/sanity/shellcheck/exclude.txt @@ -0,0 +1,2 @@ +SC1090 +SC2164