diff options
| author | Gav Wood <i@gavwood.com> | 2015-04-21 07:10:48 +0800 |
|---|---|---|
| committer | Gav Wood <i@gavwood.com> | 2015-04-21 07:10:48 +0800 |
| commit | dc9a49cc392c044b010e5536ef65c233bc8f34a7 (patch) | |
| tree | 1ce162a7485347eb3e097157fcb4c58ac1891987 /TestHelper.cpp | |
| parent | fdc524377f169158c181e7c30d186deec857087d (diff) | |
| parent | d3611017b80ff5abdec10b69c773cd013150bc13 (diff) | |
| download | dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.tar dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.tar.gz dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.tar.bz2 dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.tar.lz dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.tar.xz dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.tar.zst dexon-solidity-dc9a49cc392c044b010e5536ef65c233bc8f34a7.zip | |
Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Diffstat (limited to 'TestHelper.cpp')
| -rw-r--r-- | TestHelper.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/TestHelper.cpp b/TestHelper.cpp index ed844e96..1419afde 100644 --- a/TestHelper.cpp +++ b/TestHelper.cpp @@ -23,9 +23,6 @@ #include <thread> #include <chrono> - -#include <boost/filesystem/path.hpp> - #include <libethereum/Client.h> #include <liblll/Compiler.h> #include <libevm/VMFactory.h> @@ -592,7 +589,7 @@ void userDefinedTest(string testTypeFlag, std::function<void(json_spirit::mValue } } -void executeTests(const string& _name, const string& _testPathAppendix, std::function<void(json_spirit::mValue&, bool)> doTests) +void executeTests(const string& _name, const string& _testPathAppendix, const boost::filesystem::path _pathToFiller, std::function<void(json_spirit::mValue&, bool)> doTests) { string testPath = getTestPath(); testPath += _testPathAppendix; @@ -607,9 +604,8 @@ void executeTests(const string& _name, const string& _testPathAppendix, std::fun cnote << "Populating tests..."; json_spirit::mValue v; boost::filesystem::path p(__FILE__); - boost::filesystem::path dir = p.parent_path(); - string s = asString(dev::contents(dir.string() + "/" + _name + "Filler.json")); - BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + dir.string() + "/" + _name + "Filler.json is empty."); + string s = asString(dev::contents(_pathToFiller.string() + "/" + _name + "Filler.json")); + BOOST_REQUIRE_MESSAGE(s.length() > 0, "Contents of " + _pathToFiller.string() + "/" + _name + "Filler.json is empty."); json_spirit::read_string(s, v); doTests(v, true); writeFile(testPath + "/" + _name + ".json", asBytes(json_spirit::write_string(v, true))); |