From 6961899cb2a0abd4d236a9a6f2657b4533720484 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 13 Nov 2018 14:34:19 +0000
Subject: Do not build tests for LLL if disabled

---
 test/boostTest.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'test/boostTest.cpp')

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 34eeaec9..5352ef85 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -160,9 +160,11 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 			"SolidityAuctionRegistrar",
 			"SolidityFixedFeeRegistrar",
 			"SolidityWallet",
+#if HAVE_LLL
 			"LLLERC20",
 			"LLLENS",
 			"LLLEndToEndTest",
+#endif
 			"GasMeterTests",
 			"SolidityEndToEndTest",
 			"SolidityOptimizer"
-- 
cgit v1.2.3


From 0ff4cbe51ba653397a1937c8c08b3d09541492ef Mon Sep 17 00:00:00 2001
From: Leonardo Alt <leo@ethereum.org>
Date: Thu, 15 Nov 2018 16:47:52 +0100
Subject: Add SMTChecker tests for standard JSON

---
 test/boostTest.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'test/boostTest.cpp')

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 5352ef85..6ff6d2d2 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -38,6 +38,7 @@
 #include <test/Options.h>
 #include <test/libsolidity/ASTJSONTest.h>
 #include <test/libsolidity/SyntaxTest.h>
+#include <test/libsolidity/SMTCheckerJSONTest.h>
 #include <test/libyul/YulOptimizerTest.h>
 
 #include <boost/algorithm/string.hpp>
@@ -146,12 +147,21 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 		dev::yul::test::YulOptimizerTest::create
 	) > 0, "no Yul Optimizer tests found");
 	if (!dev::test::Options::get().disableSMT)
+	{
 		solAssert(registerTests(
 			master,
 			dev::test::Options::get().testPath / "libsolidity",
 			"smtCheckerTests",
 			SyntaxTest::create
 		) > 0, "no SMT checker tests found");
+
+		solAssert(registerTests(
+			master,
+			dev::test::Options::get().testPath / "libsolidity",
+			"smtCheckerTestsJSON",
+			SMTCheckerTest::create
+		) > 0, "no SMT checker JSON tests found");
+	}
 	if (dev::test::Options::get().disableIPC)
 	{
 		for (auto suite: {
-- 
cgit v1.2.3


From ec47c8946ba5f78563b7eca2512b3cee68db45b4 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@ethereum.org>
Date: Wed, 21 Nov 2018 12:42:34 +0100
Subject: Isolating libyul library API into its own namespace `yul`.

---
 test/boostTest.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test/boostTest.cpp')

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 5352ef85..966badfc 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -143,7 +143,7 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 		master,
 		dev::test::Options::get().testPath / "libyul",
 		"yulOptimizerTests",
-		dev::yul::test::YulOptimizerTest::create
+		yul::test::YulOptimizerTest::create
 	) > 0, "no Yul Optimizer tests found");
 	if (!dev::test::Options::get().disableSMT)
 		solAssert(registerTests(
-- 
cgit v1.2.3