Throw exception for invalid test options.

ethereum · Mar 5, 2018 · 19df28f · 19df28f
1 parent 6d77b4e
commit 19df28f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/test/TestHelper.cpp b/test/TestHelper.cpp
@@ -69,7 +69,7 @@ dev::solidity::EVMVersion Options::evmVersion() const
 		// We do this check as opposed to in the constructor because the BOOST_REQUIRE
 		// macros cannot yet be used in the constructor.
 		auto version = solidity::EVMVersion::fromString(evmVersionString);
-		BOOST_REQUIRE_MESSAGE(version, "Invalid EVM version: " + evmVersionString);
+		assertThrow(version, InvalidTestOptions, "Invalid EVM version: " + evmVersionString);
 		return *version;
 	}
 	else

diff --git a/test/TestHelper.h b/test/TestHelper.h
@@ -21,6 +21,8 @@
 
 #include <libsolidity/interface/EVMVersion.h>
 
+#include <libdevcore/Assertions.h>
+
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/version.hpp>
@@ -32,6 +34,8 @@ namespace dev
 namespace test
 {
 
+DEV_SIMPLE_EXCEPTION(InvalidTestOptions);
+
 struct Options: boost::noncopyable
 {
 	std::string ipcPath;