aboutsummaryrefslogtreecommitdiffstats
path: root/test/boostTest.cpp
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2017-04-26 20:29:54 +0800
committerGitHub <noreply@github.com>2017-04-26 20:29:54 +0800
commit3cbdf6d490c6871d58f12f877cdc84111a7325c1 (patch)
tree10c53b37db2275d9b6b220bb572ceca777e20297 /test/boostTest.cpp
parentc3b839ca751bd11a5881fea1db1cfa92ec468d16 (diff)
parentefa9c7626718023083489aebee9a1662c5f24ab5 (diff)
downloaddexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.tar
dexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.tar.gz
dexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.tar.bz2
dexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.tar.lz
dexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.tar.xz
dexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.tar.zst
dexon-solidity-3cbdf6d490c6871d58f12f877cdc84111a7325c1.zip
Merge pull request #1577 from ethereum/gas_table
Gas table update
Diffstat (limited to 'test/boostTest.cpp')
-rw-r--r--test/boostTest.cpp31
1 files changed, 29 insertions, 2 deletions
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index d1d35be3..6fc1c925 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -21,11 +21,9 @@
* Original code taken from boost sources.
*/
-#define BOOST_TEST_MODULE EthereumTests
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
-
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable:4535) // calling _set_se_translator requires /EHa
@@ -36,3 +34,32 @@
#endif
#pragma GCC diagnostic pop
+
+#include <test/TestHelper.h>
+
+using namespace boost::unit_test;
+
+test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
+{
+ master_test_suite_t& master = framework::master_test_suite();
+ master.p_name.value = "SolidityTests";
+ if (dev::test::Options::get().disableIPC)
+ {
+ for (auto suite: {
+ "SolidityAuctionRegistrar",
+ "SolidityFixedFeeRegistrar",
+ "SolidityWallet",
+ "LLLEndToEndTest",
+ "GasMeterTests",
+ "SolidityEndToEndTest",
+ "SolidityOptimizer"
+ })
+ {
+ auto id = master.get(suite);
+ assert(id != INV_TEST_UNIT_ID);
+ master.remove(id);
+ }
+ }
+
+ return 0;
+}