Run metadata and gas meter tests when optimiser is on too

axic · axic · commit 13edf1062fac · 2017-07-18T20:22:00.000+01:00
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
@@ -49,8 +49,7 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 	{
 		m_compiler.reset(false);
 		m_compiler.addSource("", "pragma solidity >=0.0;\n" + _sourceCode);
-		/// NOTE: compiles without optimisations
-		ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(), "Compiling contract failed");
+		ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(dev::test::Options::get().optimize), "Compiling contract failed");
 
 		AssemblyItems const* items = m_compiler.runtimeAssemblyItems("");
 		ASTNode const& sourceUnit = m_compiler.ast();
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
@@ -44,8 +44,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
 	)";
 	CompilerStack compilerStack;
 	compilerStack.addSource("", std::string(sourceCode));
-	/// NOTE: compiles without optimisations
-	ETH_TEST_REQUIRE_NO_THROW(compilerStack.compile(), "Compiling contract failed");
+	ETH_TEST_REQUIRE_NO_THROW(compilerStack.compile(dev::test::Options::get().optimize), "Compiling contract failed");
 	bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
 	std::string const& metadata = compilerStack.onChainMetadata("test");
 	BOOST_CHECK(dev::test::isValidMetadata(metadata));

Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,7 @@ class GasMeterTestFramework: public SolidityExecutionFramework`
`49`	`49`	`{`
`50`	`50`	`m_compiler.reset(false);`
`51`	`51`	`m_compiler.addSource("", "pragma solidity >=0.0;\n" + _sourceCode);`
`52`		`- /// NOTE: compiles without optimisations`
`53`		`- ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(), "Compiling contract failed");`
	`52`	`+ ETH_TEST_REQUIRE_NO_THROW(m_compiler.compile(dev::test::Options::get().optimize), "Compiling contract failed");`
`54`	`53`
`55`	`54`	`AssemblyItems const* items = m_compiler.runtimeAssemblyItems("");`
`56`	`55`	`ASTNode const& sourceUnit = m_compiler.ast();`