From 0b88ed689ab1a4f307a220ba1d32fffef57e6886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= Date: Thu, 9 Jun 2016 08:17:42 +0000 Subject: [PATCH] filter special ascii commands from output, otherwise jenkins cannot read the test output xml file - keep new line --- scripts/wt-mode.el | 2 +- src/commands.hxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/wt-mode.el b/scripts/wt-mode.el index 7bfff71..caf9679 100644 --- a/scripts/wt-mode.el +++ b/scripts/wt-mode.el @@ -25,7 +25,7 @@ ;; echo $(webrunner -h | sed -n 's, COMMAND: ,,p') | sed 's, ,\\\\|,g' (defconst wt-font-lock-keywords (list - '("^ *\\(ca-certificate\\|call\\|case\\|check\\|clear-cookies\\|click\\|clicktype\\|client-certificate\\|do\\|download\\|echo\\|execute\\|exists\\|exit\\|expect\\|fail\\|for\\|function\\|if\\|ignoreto\\|include\\|label\\|load\\|not\\|offline-storage-path\\|open\\|screenshot\\|set\\|setvalue\\|sleep\\|testcase\\|testsuite\\|timeout\\|unset\\|upload\\)" . font-lock-builtin-face) + '("^ *\\(ca-certificate\\|call\\|case\\|check\\|clear-cookies\\|click\\|clicktype\\|client-certificate\\|do\\|download\\|echo\\|execute\\|exists\\|exit\\|expect\\|fail\\|for\\|function\\|if\\|ignoreto\\|include\\|label\\|load\\|not\\|offline-storage-path\\|open\\|screenshot\\|set\\|setvalue\\|sleep\\|testcase\\|testsuite\\|timeout\\|unset\\|upload\\) " . font-lock-builtin-face) '("^ *#.*$" . font-lock-comment-face)) "Highlighting expressions for Webtester") diff --git a/src/commands.hxx b/src/commands.hxx index d9c90b3..9bf7164 100644 --- a/src/commands.hxx +++ b/src/commands.hxx @@ -896,7 +896,7 @@ class Script: public QObject { QString prefix (QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss ")); Command* cmd(command?command:_command); - for (QChar& c: text) if (c<32) c='?'; + for (QChar& c: text) if (c<32&&c!='\n') c='?'; if (cmd) prefix += QString("%2:%3%1 ") .arg(QString(cmd->indent(), QChar(' ')))