cerc-io/solidity
10
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cleanup of test suite init.

Browse Source
This commit is contained in:
chriseth 2016-08-06 11:37:52 +02:00
parent 0d894a6832
commit 1bc0320811
4 changed files with 33 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
test/TestHelper.cpp
View File

@ -24,28 +24,22 @@
using namespace std; using namespace std;
using namespace dev::test; using namespace dev::test;
Options::Options(int argc, char** argv) Options const& Options::get()
{ {
tArgc = 0; static Options instance;
tArgv = new char*[argc]; return instance;
for (auto i = 0; i < argc; i++)
{
string arg = argv[i];
if (arg == "--ipc" && i + 1 < argc)
{
ipcPath = argv[i + 1];
i++;
}
else
{
tArgv[i] = argv[i];
tArgc++;
}
}
} }
Options const& Options::get(int argc, char** argv) Options::Options()
{ {
static Options instance(argc, argv); auto const& suite = boost::unit_test::framework::master_test_suite();
return instance; for (auto i = 0; i < suite.argc; i++)
} if (string(suite.argv[i]) == "--ipc" && i + 1 < suite.argc)
{
ipcPath = suite.argv[i + 1];
i++;
}
if (ipcPath.empty())
if (auto path = getenv("ETH_TEST_IPC"))
ipcPath = path;
}

22
test/TestHelper.h
View File

@ -103,19 +103,15 @@ namespace test
while (0) while (0)
class Options struct Options: boost::noncopyable
{ {
public: std::string ipcPath;
std::string ipcPath;
int tArgc; Options const& get();
char **tArgv;
/// Get reference to options private:
/// The first time used, options are parsed with argc, argv Options();
static Options const& get(int argc = 0, char** argv = 0); };
private:
Options(int argc, char** argv = 0);
Options(Options const&) = delete;
};
} }
} }

64
test/boostTest.cpp
View File

@ -26,59 +26,13 @@
#pragma GCC diagnostic ignored "-Wunused-parameter" #pragma GCC diagnostic ignored "-Wunused-parameter"
#define BOOST_TEST_NO_MAIN #if defined(_MSC_VER)
#if defined(_MSC_VER) #pragma warning(push)
#pragma warning(push) #pragma warning(disable:4535) // calling _set_se_translator requires /EHa
#pragma warning(disable:4535) // calling _set_se_translator requires /EHa #endif
#endif #include <boost/test/included/unit_test.hpp>
#include <boost/test/included/unit_test.hpp> #if defined(_MSC_VER)
#if defined(_MSC_VER) #pragma warning(pop)
#pragma warning(pop) #endif
#endif
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#include <stdlib.h>
#include <boost/version.hpp>
#include "TestHelper.h"
using namespace boost::unit_test;
std::vector<char*> parameters;
static std::ostringstream strCout;
std::streambuf* oldCoutStreamBuf;
std::streambuf* oldCerrStreamBuf;
//Custom Boost Initialization
test_suite* fake_init_func(int argc, char* argv[])
{
//Required for boost. -nowarning
(void)argc;
(void)argv;
return 0;
}
//Custom Boost Unit Test Main
int main(int argc, char* argv[])
{
//Initialize options before boost reads it
dev::test::Options const& opt = dev::test::Options::get(argc, argv);
return unit_test_main(fake_init_func, opt.tArgc, opt.tArgv);
}
/*
#else
#if defined(_MSC_VER)
#pragma warning(push)
#pragma warning(disable:4535) // calling _set_se_translator requires /EHa
#endif
#include <boost/test/included/unit_test.hpp>
#if defined(_MSC_VER)
#pragma warning(pop)
#endif
#pragma GCC diagnostic pop
#include <test/TestHelper.h>
using namespace boost::unit_test;
#endif*/

3
test/libsolidity/SolidityExecutionFramework.cpp
View File

@ -38,9 +38,6 @@ namespace // anonymous
string getIPCSocketPath() string getIPCSocketPath()
{ {
string ipcPath = dev::test::Options::get().ipcPath; string ipcPath = dev::test::Options::get().ipcPath;
if (ipcPath.empty())
if (auto path = getenv("ETH_TEST_IPC"))
ipcPath = path;
if (ipcPath.empty()) if (ipcPath.empty())
BOOST_FAIL("ERROR: ipcPath not set! (use --ipc <path> or the environment variable ETH_TEST_IPC)"); BOOST_FAIL("ERROR: ipcPath not set! (use --ipc <path> or the environment variable ETH_TEST_IPC)");