utils/checkpackagelib/test_tool.py: fix expectation

While committing the shellcheck feature, it was changed to output the
full shellcheck output even at verbosity level 1. However, the
expectation of the shellcheck test was not updated accordingly.

Do that now, simply merging all the shellcheck output in a single
string.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

utils/checkpackagelib/test_tool.py

@@ -71,9 +71,9 @@ Shellcheck = [
      'empty.sh',
      '',
      ["dir/empty.sh:0: run 'shellcheck' and fix the warnings",
-      "In dir/empty.sh line 1:",
-      "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.",
-      "For more information:",
+      "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"
+      "For more information:\n"
       "  https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y..."]),
     ('sh shebang',
      'sh-shebang.sh',
@@ -87,21 +87,21 @@ Shellcheck = [
      'unused.sh',
      'unused=""',
      ["dir/unused.sh:0: run 'shellcheck' and fix the warnings",
-      "In dir/unused.sh line 1:",
-      'unused=""',
-      "^-- SC2148: Tips depend on target shell and yours is unknown. Add a shebang or a 'shell' directive.",
-      "^----^ SC2034: unused appears unused. Verify use (or export if used externally).",
-      "For more information:",
-      "  https://www.shellcheck.net/wiki/SC2148 -- Tips depend on target shell and y...",
+      "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"
+      "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..."]),
     ('tab',
      'tab.sh',
      '\t#!/bin/sh',
      ["dir/tab.sh:0: run 'shellcheck' and fix the warnings",
-      "In dir/tab.sh line 1:",
-      '\t#!/bin/sh',
-      "^-- SC1114: Remove leading spaces before the shebang.",
-      "For more information:",
+      "In dir/tab.sh line 1:\n"
+      '\t#!/bin/sh\n'
+      "^-- SC1114: Remove leading spaces before the shebang.\n"
+      "For more information:\n"
       "  https://www.shellcheck.net/wiki/SC1114 -- Remove leading spaces before the ..."]),
     ]