Commit 215654b5 authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Christian Stenger

AutoTest: Fix execution of Gtest

Change-Id: I7e358b31eea41e1896a43c5efb9a9336ec127c33
Reviewed-by: default avatarChristian Stenger <christian.stenger@theqtcompany.com>
parent 5c10c5ff
......@@ -768,7 +768,7 @@ static TestTreeItem *constructTestTreeItem(const QString &fileName,
}
static TestTreeItem *constructGTestTreeItem(const QString &filePath, const QString &testCaseName,
const bool parameterized, const QString &proFile,
const bool parameterized,
const QString &referencingFile,
const TestCodeLocationList &testSets)
{
......@@ -781,7 +781,7 @@ static TestTreeItem *constructGTestTreeItem(const QString &filePath, const QStri
treeItemChild->setState(locationAndType.m_state);
treeItemChild->setLine(locationAndType.m_line);
treeItemChild->setColumn(locationAndType.m_column);
treeItemChild->setMainFile(proFile);
treeItemChild->setMainFile(referencingFile);
item->appendChild(treeItemChild);
}
item->setReferencingFile(referencingFile);
......@@ -801,8 +801,7 @@ void TestTreeModel::onParseResultReady(TestParseResult result)
case GoogleTest:
QTC_ASSERT(result.dataTagsOrTestSets.size() == 1, return);
addTestTreeItem(constructGTestTreeItem(result.fileName, result.testCaseName,
result.parameterized, result.proFile,
result.referencingFile,
result.parameterized, result.referencingFile,
result.dataTagsOrTestSets.first()), result.type);
break;
case Invalid:
......
......@@ -153,7 +153,6 @@ struct TestParseResult
TestTreeModel::Type type;
QString fileName;
QString proFile;
QString referencingFile;
QString testCaseName;
int line = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment