development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

filter special ascii commands from output, otherwise jenkins cannot read the test output xml file - keep new line

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-06-09 08:17:42 +00:00
parent d991ec9133
commit 0b88ed689a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/wt-mode.el
View File

@@ -25,7 +25,7 @@
;; echo $(webrunner -h | sed -n 's, COMMAND: ,,p') | sed 's, ,\\\\|,g' ;; echo $(webrunner -h | sed -n 's, COMMAND: ,,p') | sed 's, ,\\\\|,g'
(defconst wt-font-lock-keywords (defconst wt-font-lock-keywords
(list (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)) '("^ *#.*$" . font-lock-comment-face))
"Highlighting expressions for Webtester") "Highlighting expressions for Webtester")

2
src/commands.hxx
View File

@@ -896,7 +896,7 @@ class Script: public QObject {
QString prefix QString prefix
(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss ")); (QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss "));
Command* cmd(command?command:_command); 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) if (cmd)
prefix += QString("%2:%3%1 ") prefix += QString("%2:%3%1 ")
.arg(QString(cmd->indent(), QChar(' '))) .arg(QString(cmd->indent(), QChar(' ')))