Skip to content
This repository was archived by the owner on Oct 28, 2021. It is now read-only.
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions test/tools/libtesteth/TestOutputHelper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,31 +126,34 @@ bool pathHasTests(boost::filesystem::path const& _path)

void TestOutputHelper::checkUnfinishedTestFolders()
{
// Unit tests does not mark test folders
if (m_finishedTestFoldersMap.size() == 0)
return;

// -t SuiteName/caseName parse caseName as filter
// rCurrentTestSuite is empty if run without -t argument
string filter;
size_t pos = Options::get().rCurrentTestSuite.find('/');
size_t pos = Options::get().rCurrentTestSuite.rfind('/');
if (pos != string::npos)
filter = Options::get().rCurrentTestSuite.substr(pos + 1);

if (!filter.empty())
std::map<boost::filesystem::path, FolderNameSet>::const_iterator singleTest =
m_finishedTestFoldersMap.begin();
if (!filter.empty() && boost::filesystem::exists(singleTest->first / filter))
{
if (m_finishedTestFoldersMap.size() > 1)
{
std::cerr << "ERROR: Expected a single test to be passed: " << filter << "\n";
return;
}

// Unit tests does not mark test folders
if (m_finishedTestFoldersMap.size() == 0)
return;

std::map<boost::filesystem::path, FolderNameSet>::const_iterator it =
m_finishedTestFoldersMap.begin();
if (!pathHasTests(it->first / filter))
std::cerr << "WARNING: Test folder " << it->first / filter
if (!pathHasTests(singleTest->first / filter))
{
std::cerr << "WARNING: Test folder " << singleTest->first / filter
<< " appears to have no tests!"
<< "\n";
return;
}
}
else
{
Expand Down