cerc-io/solidity
11
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 committed 2016-08-12 15:11:30 +02:00
1 parent 0d894a6832
commit 1bc0320811
4 files changed
+33 -92
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

test/boostTest.cpp
+9 -55
View File
@@ -26,59 +26,13 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#define BOOST_TEST_NO_MAIN
#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
#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 <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*/
#pragma GCC diagnostic pop