aboutsummaryrefslogtreecommitdiffstats
path: root/hexPrefix.cpp
diff options
context:
space:
mode:
authorChristian <c@ethdev.com>2014-10-29 20:54:36 +0800
committerChristian <c@ethdev.com>2014-10-29 20:54:36 +0800
commit9eacf5737fa87e5a0029e991b04d43c7f77d2141 (patch)
tree45fb0c5636f81832d24cc43998040f10a8219a81 /hexPrefix.cpp
parentb03a6a35633e658153046f3df2b57ae89f90cfd6 (diff)
parentcacc4477bf134ce28a87414e839e8fcc857a947d (diff)
downloaddexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.tar
dexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.tar.gz
dexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.tar.bz2
dexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.tar.lz
dexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.tar.xz
dexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.tar.zst
dexon-solidity-9eacf5737fa87e5a0029e991b04d43c7f77d2141.zip
Merge remote-tracking branch 'ethereum/develop' into sol_contractCompiler
Conflicts: libsolidity/Types.cpp
Diffstat (limited to 'hexPrefix.cpp')
-rw-r--r--hexPrefix.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/hexPrefix.cpp b/hexPrefix.cpp
index fb2fbc82..99207ab9 100644
--- a/hexPrefix.cpp
+++ b/hexPrefix.cpp
@@ -33,9 +33,20 @@ namespace js = json_spirit;
BOOST_AUTO_TEST_CASE(hexPrefix_test)
{
+ const char* ptestPath = getenv("ETHEREUM_TEST_PATH");
+ string testPath;
+
+ if (ptestPath == NULL)
+ {
+ cnote << " could not find environment variable ETHEREUM_TEST_PATH \n";
+ testPath = "../../../tests";
+ }
+ else
+ testPath = ptestPath;
+
cnote << "Testing Hex-Prefix-Encode...";
js::mValue v;
- string s = asString(contents("../../../tests/hexencodetest.json"));
+ string s = asString(contents(testPath + "/hexencodetest.json"));
BOOST_REQUIRE_MESSAGE(s.length() > 0, "Content from 'hexencodetest.json' is empty. Have you cloned the 'tests' repo branch develop?");
js::read_string(s, v);
for (auto& i: v.get_obj())