error report: merge with latesd develop

This commit is contained in:
Dimitry 2015-08-11 14:30:35 +03:00
parent d6d8951baf
commit c0aa9f6726
2 changed files with 2 additions and 2 deletions

View File

@ -320,7 +320,7 @@ int ImportTest::exportTest(bytes const& _output)
{
int err = 0;
// export output
m_TestObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add);
m_testObject["out"] = (_output.size() > 4096 && !Options::get().fulloutput) ? "#" + toString(_output.size()) : toHex(_output, 2, HexPrefix::Add);
// compare expected output with post output
if (m_testObject.count("expectOut") > 0)

View File

@ -46,7 +46,7 @@ public:
{
if (g_logVerbosity != -1)
g_logVerbosity = 0;
m_state.resetCurrent();
//m_state.resetCurrent();
}
bytes const& compileAndRunWithoutCheck(