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

no special characters in classname and name attributes, otherwise jenkins cannot read the test output xml file

Browse Source
This commit is contained in:
Marc Wäckerlin
2016-06-09 09:47:50 +00:00
parent 0b88ed689a
commit 5e4443478d
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@@ -28,6 +28,8 @@ AX_USE_RPM_PACKAGING
AX_BUILD_TEST AX_BUILD_TEST
#AX_BUILD_EXAMPLES #AX_BUILD_EXAMPLES
# language requirements
AX_CXX_COMPILE_STDCXX_11
export QT_SELECT=5 export QT_SELECT=5
AC_SUBST(QT_SELECT) AC_SUBST(QT_SELECT)

8
src/commands.hxx
View File

@@ -601,9 +601,13 @@ class Script: public QObject {
for (auto cmd(_script.begin()); cmd!=_script.end(); ++cmd) { for (auto cmd(_script.begin()); cmd!=_script.end(); ++cmd) {
xml::Node testcase("testcase"); xml::Node testcase("testcase");
try { try {
testcase.attr("classname") = xmlattr(_testclass, true).toStdString(); testcase.attr("classname") =
xmlattr(_testclass.size()?_testclass:(*cmd)->file(), true).toStdString();
testcase.attr("name") = testcase.attr("name") =
xmlattr((*cmd)->command(), true).toStdString(); xmlattr(QString("%1: %2")
.arg((*cmd)->line())
.arg((*cmd)->command().split('\n').takeFirst(), true))
.toStdString();
if (!_ignores.size() || (*cmd)->tag()=="label") { // not ignored if (!_ignores.size() || (*cmd)->tag()=="label") { // not ignored
_timer.start(_timeout*1000); _timer.start(_timeout*1000);
try { try {