From fa69d6a5298fc1c53dc83c8036463c7e4d02d1b1 Mon Sep 17 00:00:00 2001 From: CJentzsch Date: Mon, 11 May 2015 10:11:36 +0200 Subject: [PATCH] optional wallet blockChain tests, beacuse it takes a while --- test/TestHelper.cpp | 3 +++ test/TestHelper.h | 1 + test/libethereum/blockchain.cpp | 3 ++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp index 96e11e02c..79fdaa158 100644 --- a/test/TestHelper.cpp +++ b/test/TestHelper.cpp @@ -732,6 +732,8 @@ Options::Options() bigData = true; else if (arg == "--checkstate") checkState = true; + else if (arg == "--wallet") + wallet = true; else if (arg == "--all") { performance = true; @@ -739,6 +741,7 @@ Options::Options() memory = true; inputLimits = true; bigData = true; + wallet= true; } else if (arg == "--singletest" && i + 1 < argc) { diff --git a/test/TestHelper.h b/test/TestHelper.h index 02f509e4c..e63634053 100644 --- a/test/TestHelper.h +++ b/test/TestHelper.h @@ -195,6 +195,7 @@ public: bool memory = false; bool inputLimits = false; bool bigData = false; + bool wallet = false; /// @} /// Get reference to options diff --git a/test/libethereum/blockchain.cpp b/test/libethereum/blockchain.cpp index c5ac936fe..585a741b9 100644 --- a/test/libethereum/blockchain.cpp +++ b/test/libethereum/blockchain.cpp @@ -787,7 +787,8 @@ BOOST_AUTO_TEST_CASE(bcGasPricerTest) BOOST_AUTO_TEST_CASE(bcWalletTest) { - dev::test::executeTests("bcWalletTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests); + if (test::Options::get().wallet) + dev::test::executeTests("bcWalletTest", "/BlockTests",dev::test::getFolder(__FILE__) + "/BlockTestsFiller", dev::test::doBlockchainTests); } BOOST_AUTO_TEST_CASE(userDefinedFile)