diff options
-rw-r--r-- | checkRandomStateTest.cpp | 12 | ||||
-rw-r--r-- | checkRandomVMTest.cpp | 6 | ||||
-rw-r--r-- | createRandomVMTest.cpp | 6 |
3 files changed, 13 insertions, 11 deletions
diff --git a/checkRandomStateTest.cpp b/checkRandomStateTest.cpp index 90a88d57..4c07c3cf 100644 --- a/checkRandomStateTest.cpp +++ b/checkRandomStateTest.cpp @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with cpp-ethereum. If not, see <http://www.gnu.org/licenses/>. */ -/** @file checkRandomTest.cpp +/** @file checkRandomStateTest.cpp * @author Christoph Jentzsch <jentzsch.simulationsoftware@gmail.com> * @date 2015 * Check a random test and return 0/1 for success or failure. To be used for efficiency in the random test simulation. @@ -33,7 +33,7 @@ using namespace json_spirit; using namespace dev::test; using namespace dev; -bool doStateTest(mValue& v); +bool doStateTest(mValue& _v); int main(int argc, char *argv[]) { @@ -67,11 +67,11 @@ int main(int argc, char *argv[]) return ret; } -bool doStateTest(mValue& v) +bool doStateTest(mValue& _v) { eth::VMFactory::setKind(eth::VMKind::JIT); - for (auto& i: v.get_obj()) + for (auto& i: _v.get_obj()) { mObject& o = i.second.get_obj(); @@ -152,7 +152,9 @@ bool doStateTest(mValue& v) auto& expectedAddr = expectedPair.first; auto resultAddrIt = resultAddrs.find(expectedAddr); if (resultAddrIt == resultAddrs.end()) - BOOST_ERROR("Missing expected address " << expectedAddr); + { + cout << "Missing expected address " << expectedAddr; + return 1; else { if (importer.m_statePost.balance(expectedAddr) != theState.balance(expectedAddr)) diff --git a/checkRandomVMTest.cpp b/checkRandomVMTest.cpp index e3442d43..c9635771 100644 --- a/checkRandomVMTest.cpp +++ b/checkRandomVMTest.cpp @@ -32,7 +32,7 @@ using namespace json_spirit; using namespace dev::test; using namespace dev; -bool doVMTest(mValue& v); +bool doVMTest(mValue& _v); int main(int argc, char *argv[]) { @@ -66,11 +66,11 @@ int main(int argc, char *argv[]) return ret; } -bool doVMTest(mValue& v) +bool doVMTest(mValue& _v) { eth::VMFactory::setKind(eth::VMKind::JIT); - for (auto& i: v.get_obj()) + for (auto& i: _v.get_obj()) { cnote << i.first; mObject& o = i.second.get_obj(); diff --git a/createRandomVMTest.cpp b/createRandomVMTest.cpp index 55e02375..de81099f 100644 --- a/createRandomVMTest.cpp +++ b/createRandomVMTest.cpp @@ -41,7 +41,7 @@ using namespace std; using namespace json_spirit; using namespace dev; -void doMyTests(json_spirit::mValue& v); +void doMyTests(json_spirit::mValue& _v); int main(int argc, char *argv[]) { @@ -127,11 +127,11 @@ int main(int argc, char *argv[]) return 0; } -void doMyTests(json_spirit::mValue& v) +void doMyTests(json_spirit::mValue& _v) { eth::VMFactory::setKind(eth::VMKind::Interpreter); - for (auto& i: v.get_obj()) + for (auto& i: _v.get_obj()) { cnote << i.first; mObject& o = i.second.get_obj(); |