aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Kotewicz <marek.kotewicz@gmail.com>2015-07-16 16:21:48 +0800
committerMarek Kotewicz <marek.kotewicz@gmail.com>2015-07-16 16:21:48 +0800
commitd22bb9acc5c3589dd8ce7d99ca78a72b5d595628 (patch)
treef3a96457a4e0f3c988e4d217529f349075b2ef4b
parente2f1d13678fb876f0c584ee87d4a9f9ec80cc9f2 (diff)
parent6be070cf1f9e620995aaff7774669dd3f9f8fa90 (diff)
downloaddexon-solidity-d22bb9acc5c3589dd8ce7d99ca78a72b5d595628.tar.gz
dexon-solidity-d22bb9acc5c3589dd8ce7d99ca78a72b5d595628.tar.zst
dexon-solidity-d22bb9acc5c3589dd8ce7d99ca78a72b5d595628.zip
Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into client_ref
-rw-r--r--TestHelper.cpp2
-rw-r--r--TestHelper.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp
index 2ed1ed4d..f49ed1e0 100644
--- a/TestHelper.cpp
+++ b/TestHelper.cpp
@@ -767,6 +767,8 @@ Options::Options()
wallet = true;
else if (arg == "--nonetwork")
nonetwork = true;
+ else if (arg == "--network")
+ nonetwork = false;
else if (arg == "--nodag")
nodag = true;
else if (arg == "--all")
diff --git a/TestHelper.h b/TestHelper.h
index 4ac59e91..42027883 100644
--- a/TestHelper.h
+++ b/TestHelper.h
@@ -224,7 +224,7 @@ public:
bool inputLimits = false;
bool bigData = false;
bool wallet = false;
- bool nonetwork = false;
+ bool nonetwork = true;
bool nodag = true;
/// @}