Merge branch 'develop' into sol_natspecMultiline

2023-10-03 13:03:40 +00:00 · 2014-12-18 16:49:56 +01:00 · 2014-12-18 16:49:56 +01:00 · 89f5b86692
commit 89f5b86692
parent fc981d5d79 5dbe2f198c
9 changed files with 2 additions and 2 deletions
--- a/solidityJSONInterfaceTest.cpp
+++ b/solidityJSONInterfaceTest.cpp
--- a/SolidityCompiler.cpp
+++ b/SolidityCompiler.cpp
--- a/SolidityEndToEndTest.cpp
+++ b/SolidityEndToEndTest.cpp
@ -36,7 +36,7 @@ namespace solidity
 namespace test
 {
-BOOST_FIXTURE_TEST_SUITE(SolidityCompilerEndToEndTest, ExecutionFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, ExecutionFramework)
 BOOST_AUTO_TEST_CASE(smoke_test)
 {
--- a/SolidityExpressionCompiler.cpp
+++ b/SolidityExpressionCompiler.cpp
--- a/SolidityNameAndTypeResolution.cpp
+++ b/SolidityNameAndTypeResolution.cpp
--- a/SolidityNatspecJSON.cpp
+++ b/SolidityNatspecJSON.cpp
--- a/solidityOptimizerTest.cpp
+++ b/solidityOptimizerTest.cpp
@ -71,7 +71,7 @@ protected:
 	Address m_nonOptimizedContract;
 };
-BOOST_FIXTURE_TEST_SUITE(SolidityOptimizerTest, OptimizerTestFramework)
+BOOST_FIXTURE_TEST_SUITE(SolidityOptimizer, OptimizerTestFramework)
 BOOST_AUTO_TEST_CASE(smoke_test)
 {
--- a/SolidityParser.cpp
+++ b/SolidityParser.cpp
--- a/SolidityScanner.cpp
+++ b/SolidityScanner.cpp