|
|
@ -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 { |
|
|
|