cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5966 from ethereum/AnsiColorized

Browse Source 
Adapts tests/ to use AnsiColorized (the generalized/moved version of FormattedScope, which in turn is removed in this PR)
This commit is contained in:
chriseth
2019-02-11 16:41:14 +01:00
committed by GitHub
parent 92cb6cb793 53f9be8a23
commit 91d224dfb6
9 changed files with 43 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/tools/isoltest.cpp
+11 -10
View File
@@ -16,6 +16,7 @@
*/
#include <libdevcore/CommonIO.h>
#include <libdevcore/AnsiColorized.h>
#include <test/Common.h>
#include <test/libsolidity/AnalysisFramework.h>
@@ -38,7 +39,7 @@
using namespace dev;
using namespace dev::solidity;
using namespace dev::solidity::test;
using namespace dev::solidity::test::formatting;
using namespace dev::formatting;
using namespace std;
namespace po = boost::program_options;
namespace fs = boost::filesystem;
@@ -110,7 +111,7 @@ TestTool::Result TestTool::process()
bool success;
std::stringstream outputMessages;
(FormattedScope(cout, m_formatted, {BOLD}) << m_name << ": ").flush();
(AnsiColorized(cout, m_formatted, {BOLD}) << m_name << ": ").flush();
try
{
@@ -119,33 +120,33 @@ TestTool::Result TestTool::process()
}
catch(boost::exception const& _e)
{
FormattedScope(cout, m_formatted, {BOLD, RED}) <<
AnsiColorized(cout, m_formatted, {BOLD, RED}) <<
"Exception during syntax test: " << boost::diagnostic_information(_e) << endl;
return Result::Exception;
}
catch (std::exception const& _e)
{
FormattedScope(cout, m_formatted, {BOLD, RED}) <<
AnsiColorized(cout, m_formatted, {BOLD, RED}) <<
"Exception during syntax test: " << _e.what() << endl;
return Result::Exception;
}
catch (...)
{
FormattedScope(cout, m_formatted, {BOLD, RED}) <<
AnsiColorized(cout, m_formatted, {BOLD, RED}) <<
"Unknown exception during syntax test." << endl;
return Result::Exception;
}
if (success)
{
FormattedScope(cout, m_formatted, {BOLD, GREEN}) << "OK" << endl;
AnsiColorized(cout, m_formatted, {BOLD, GREEN}) << "OK" << endl;
return Result::Success;
}
else
{
FormattedScope(cout, m_formatted, {BOLD, RED}) << "FAIL" << endl;
AnsiColorized(cout, m_formatted, {BOLD, RED}) << "FAIL" << endl;
FormattedScope(cout, m_formatted, {BOLD, CYAN}) << " Contract:" << endl;
AnsiColorized(cout, m_formatted, {BOLD, CYAN}) << " Contract:" << endl;
m_test->printSource(cout, " ", m_formatted);
cout << endl << outputMessages.str() << endl;
@@ -305,7 +306,7 @@ boost::optional<TestStats> runTestSuite(
TestStats stats = TestTool::processPath(_testCaseCreator, _basePath, _subdirectory, _formatted);
cout << endl << _name << " Test Summary: ";
FormattedScope(cout, _formatted, {BOLD, stats ? GREEN : RED}) <<
AnsiColorized(cout, _formatted, {BOLD, stats ? GREEN : RED}) <<
stats.successCount <<
"/" <<
stats.testCount;
@@ -389,7 +390,7 @@ Allowed options)",
}
cout << endl << "Summary: ";
FormattedScope(cout, formatted, {BOLD, global_stats ? GREEN : RED}) <<
AnsiColorized(cout, formatted, {BOLD, global_stats ? GREEN : RED}) <<
global_stats.successCount << "/" << global_stats.testCount;
cout << " tests successful." << endl;