take into account possible newlines in test_run_shell_cmd_fail

boegel · Oct 14, 2024 · ccffead · ccffead
1 parent cce1258
commit ccffead
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/test/framework/run.py b/test/framework/run.py
@@ -531,10 +531,10 @@ def handler(signum, _):
                     r"\s+full command\s+ ->  kill -9 \$\$",
                     r"\s+exit code\s+ ->  -9",
                     r"\s+working directory\s+ ->  " + work_dir,
-                    r"\s+called from\s+ ->  'test_run_shell_cmd_fail' function in .*/test/.*/run.py \(line [0-9]+\)",
-                    r"\s+output \(stdout\)\s+ -> .*/run-shell-cmd-output/kill-.*/out.txt",
-                    r"\s+error/warnings \(stderr\)\s+ -> .*/run-shell-cmd-output/kill-.*/err.txt",
-                    r"\s+interactive shell script\s* ->  .*/run-shell-cmd-output/kill-.*/cmd.sh",
+                    r"\s+called from\s+ ->  'test_run_shell_cmd_fail' function in (.|\n)*/test/(.|\n)*/run.py \(line [0-9]+\)",
+                    r"\s+output \(stdout\)\s+ -> (.|\n)*/run-shell-cmd-output/kill-(.|\n)*/out.txt",
+                    r"\s+error/warnings \(stderr\)\s+ -> (.|\n)*/run-shell-cmd-output/kill-(.|\n)*/err.txt",
+                    r"\s+interactive shell script\s* ->  (.|\n)*/run-shell-cmd-output/kill-(.|\n)*/cmd.sh",
                 ]
                 for pattern in patterns:
                     regex = re.compile(pattern, re.M)