TestFramework: Remove headers from Options.h

test/ExecutionFramework.h

@@ -34,6 +34,8 @@
 
 #include <functional>
 
+#include <boost/test/unit_test.hpp>
+
 namespace solidity::test
 {
 class EVMHost;

test/Options.cpp

@@ -29,6 +29,7 @@
 #include <boost/test/framework.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#include <boost/test/unit_test.hpp>
 
 using namespace std;
 using namespace solidity::test;

test/Options.h

@@ -17,13 +17,8 @@
 
 #pragma once
 
-#include <liblangutil/EVMVersion.h>
 #include <test/Common.h>
 
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
-#include <boost/version.hpp>
 
 #include <functional>
 

test/liblangutil/CharStream.cpp

@@ -25,6 +25,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 namespace solidity::langutil::test
 {
 

test/liblangutil/SourceLocation.cpp

@@ -24,6 +24,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 namespace solidity::langutil::test
 {
 

test/libsolidity/ASTJSONTest.cpp

@@ -25,6 +25,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/throw_exception.hpp>
+#include <boost/test/unit_test.hpp>
 #include <fstream>
 #include <memory>
 #include <stdexcept>

test/libsolidity/GasTest.cpp

@@ -22,6 +22,8 @@
 #include <liblangutil/SourceReferenceFormatterHuman.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/throw_exception.hpp>
 #include <fstream>
 #include <stdexcept>

test/libsolidity/InlineAssembly.cpp

@@ -35,6 +35,7 @@
 #include <libevmasm/Assembly.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include <memory>
 #include <optional>

test/libsolidity/Metadata.cpp

@@ -27,6 +27,8 @@
 #include <libsolutil/IpfsHash.h>
 #include <libsolutil/JSON.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::frontend::test

test/libsolidity/SMTCheckerJSONTest.cpp

@@ -23,6 +23,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/throw_exception.hpp>
 #include <fstream>
 #include <memory>

test/libsolidity/SemVerMatcher.cpp

@@ -27,6 +27,8 @@
 #include <liblangutil/SemVerHandler.h>
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 using namespace solidity::langutil;
 

test/libsolidity/SolidityCompiler.cpp

@@ -22,6 +22,8 @@
 #include <test/Metadata.h>
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::frontend::test

test/libsolidity/SolidityExpressionCompiler.cpp

@@ -33,6 +33,8 @@
 #include <liblangutil/ErrorReporter.h>
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;

test/libsolidity/SolidityNatspecJSON.cpp

@@ -27,6 +27,8 @@
 #include <liblangutil/Exceptions.h>
 #include <libsolutil/Exceptions.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace solidity::langutil;
 
 namespace solidity::frontend::test

test/libsolidity/SolidityParser.cpp

@@ -29,6 +29,8 @@
 #include <test/libsolidity/ErrorCheck.h>
 #include <libsolidity/ast/ASTVisitor.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 using namespace solidity::langutil;
 

test/libsolidity/SyntaxTest.cpp

@@ -19,6 +19,7 @@
 #include <test/Options.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+#include <boost/test/unit_test.hpp>
 #include <boost/throw_exception.hpp>
 #include <fstream>
 #include <memory>

test/libsolutil/Checksum.cpp

@@ -21,9 +21,10 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Exceptions.h>
 
-
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/CommonData.cpp

@@ -25,6 +25,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 using namespace solidity::frontend;
 

test/libsolutil/IndentedWriter.cpp

@@ -22,6 +22,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/IpfsHash.cpp

@@ -22,6 +22,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/IterateReplacing.cpp

@@ -22,6 +22,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/JSON.cpp

@@ -23,6 +23,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/StringUtils.cpp

@@ -26,6 +26,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/SwarmHash.cpp

@@ -24,6 +24,8 @@
 
 #include <libsolutil/Keccak256.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/UTF8.cpp

@@ -23,6 +23,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libsolutil/Whiskers.cpp

@@ -22,6 +22,8 @@
 
 #include <test/Options.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::util::test

test/libyul/CompilabilityChecker.cpp

@@ -25,6 +25,7 @@
 
 #include <libyul/CompilabilityChecker.h>
 
+#include <boost/test/unit_test.hpp>
 
 using namespace std;
 

test/libyul/Metrics.cpp

@@ -25,6 +25,7 @@
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/AsmData.h>
 
+#include <boost/test/unit_test.hpp>
 
 using namespace std;
 using namespace solidity::langutil;

test/libyul/ObjectParser.cpp

@@ -28,6 +28,7 @@
 #include <libsolidity/interface/OptimiserSettings.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include <memory>
 #include <optional>

test/libyul/Parser.cpp

@@ -32,6 +32,7 @@
 #include <liblangutil/ErrorReporter.h>
 
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/test/unit_test.hpp>
 
 #include <memory>
 #include <optional>

test/libyul/StackReuseCodegen.cpp

@@ -23,6 +23,8 @@
 #include <libyul/AssemblyStack.h>
 #include <libevmasm/Instruction.h>
 
+#include <boost/test/unit_test.hpp>
+
 using namespace std;
 
 namespace solidity::yul::test