Cannot specify ABIEncoderV2 pragma twice

axic · chriseth · commit 890dc43cf91b · 2019-02-19T14:36:42.000+01:00
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
@@ -66,7 +66,7 @@ class SolidityExecutionFramework: public dev::test::ExecutionFramework
 	{
 		// Silence compiler version warning
 		std::string sourceCode = "pragma solidity >=0.0;\n";
-		if (dev::test::Options::get().useABIEncoderV2)
+		if (dev::test::Options::get().useABIEncoderV2 && _sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos)
 			sourceCode += "pragma experimental ABIEncoderV2;\n";
 		sourceCode += _sourceCode;
 		m_compiler.reset(false);

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class SolidityExecutionFramework: public dev::test::ExecutionFramework`
`66`	`66`	`{`
`67`	`67`	`// Silence compiler version warning`
`68`	`68`	`std::string sourceCode = "pragma solidity >=0.0;\n";`
`69`		`- if (dev::test::Options::get().useABIEncoderV2)`
	`69`	`+ if (dev::test::Options::get().useABIEncoderV2 && _sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos)`
`70`	`70`	`sourceCode += "pragma experimental ABIEncoderV2;\n";`
`71`	`71`	`sourceCode += _sourceCode;`
`72`	`72`	`m_compiler.reset(false);`