From 14294430795939befbeca611275ed38bdadae8c2 Mon Sep 17 00:00:00 2001 From: Dimitry Date: Tue, 16 May 2017 12:22:34 +0300 Subject: [PATCH] output stright the test info when using --singletest option --- test/tools/libtesteth/TestHelper.cpp | 6 ++++-- test/tools/libtesteth/TestOutputHelper.cpp | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/test/tools/libtesteth/TestHelper.cpp b/test/tools/libtesteth/TestHelper.cpp index e12ff17087e..a7a59a1ef7c 100644 --- a/test/tools/libtesteth/TestHelper.cpp +++ b/test/tools/libtesteth/TestHelper.cpp @@ -453,7 +453,8 @@ void executeTests(const string& _name, const string& _testPathAppendix, const st { try { - cnote << "Populating tests..."; + if (!Options::get().singleTest) + cnote << "Populating tests..."; json_spirit::mValue v; boost::filesystem::path p(__FILE__); @@ -477,7 +478,8 @@ void executeTests(const string& _name, const string& _testPathAppendix, const st } try { - cnote << "TEST " << name << ":"; + if (!Options::get().singleTest) + cnote << "TEST " << name << ":"; json_spirit::mValue v; string s = asString(dev::contents(testPath + "/" + name + ".json")); BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + testPath + "/" + name + ".json is empty. Have you cloned the 'tests' repo branch develop and set ETHEREUM_TEST_PATH to its path?"); diff --git a/test/tools/libtesteth/TestOutputHelper.cpp b/test/tools/libtesteth/TestOutputHelper.cpp index 1911eab7ed0..c4928fc0ec0 100644 --- a/test/tools/libtesteth/TestOutputHelper.cpp +++ b/test/tools/libtesteth/TestOutputHelper.cpp @@ -44,7 +44,8 @@ void TestOutputHelper::initTest(int _maxTests) NoProof::init(); m_timer.restart(); m_currentTestCaseName = boost::unit_test::framework::current_test_case().p_name; - std::cout << "Test Case \"" + m_currentTestCaseName + "\": " << std::endl; + if (!Options::get().singleTest) + std::cout << "Test Case \"" + m_currentTestCaseName + "\": " << std::endl; m_maxTests = _maxTests; m_currTest = 0; } @@ -56,7 +57,8 @@ void TestOutputHelper::initTest(json_spirit::mValue& _v) NoProof::init(); m_timer.restart(); m_currentTestCaseName = boost::unit_test::framework::current_test_case().p_name; - std::cout << "Test Case \"" + m_currentTestCaseName + "\": " << std::endl; + if (!Options::get().singleTest) + std::cout << "Test Case \"" + m_currentTestCaseName + "\": " << std::endl; m_maxTests = _v.get_obj().size(); m_currTest = 0; }