From 4f78d362aa907ee019b9f43c56c8f4322d242f3c Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Sat, 8 Feb 2025 15:23:19 +0100 Subject: [PATCH] utils/checkpackagelib: fix shellcheck tests after update to shellcheck 0.9.0 shellcheck tests needs to be updated after shellcheck 0.9.0 update due to changes in errors/warning reporting: utils/checkpackagelib/test_tool.py::test_Shellcheck[missing shebang-empty.sh--expected0] FAILED [ 98%] utils/checkpackagelib/test_tool.py::test_Shellcheck[2 warnings-unused.sh-unused=""-expected3] FAILED [ 99%] utils/checkpackagelib/test_tool.py::test_Shellcheck[tab-tab.sh-\t#!/bin/sh-expected4] FAILED [100%] Signed-off-by: Romain Naour Signed-off-by: Peter Korsgaard --- utils/checkpackagelib/test_tool.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/checkpackagelib/test_tool.py b/utils/checkpackagelib/test_tool.py index cfa826f57c..56326398d3 100644 --- a/utils/checkpackagelib/test_tool.py +++ b/utils/checkpackagelib/test_tool.py @@ -100,7 +100,7 @@ Shellcheck = [ '', ["dir/empty.sh:0: run 'shellcheck' and fix the warnings", "In dir/empty.sh line 1:\n" - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]), ('sh shebang', @@ -117,8 +117,8 @@ Shellcheck = [ ["dir/unused.sh:0: run 'shellcheck' and fix the warnings", "In dir/unused.sh line 1:\n" 'unused=""\n' - "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" - "^----^ SC2034: unused appears unused. Verify use (or export if used externally).\n" + "^-- SC2148 (error): Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.\n" + "^----^ SC2034 (warning): unused appears unused. Verify use (or export if used externally).\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...\n" " https://www.shellcheck.net/wiki/SC2034 -- unused appears unused. Verify use..."]), @@ -128,7 +128,7 @@ Shellcheck = [ ["dir/tab.sh:0: run 'shellcheck' and fix the warnings", "In dir/tab.sh line 1:\n" '\t#!/bin/sh\n' - "^-- SC1114: Remove leading spaces before the shebang.\n" + "^-- SC1114 (error): Remove leading spaces before the shebang.\n" "For more information:\n" " https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]), ]