Merge pull request #5599 from ethereum/cleanup-testsuite

Have only one source where testsuites are defined

3 files changed, 87 insertions, 96 deletions

diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
new file mode 100644
index 00000000..be076059
--- /dev/null
+++ b/test/InteractiveTests.h
@@ -0,0 +1,63 @@
+/*
+	This file is part of solidity.
+
+	solidity is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 3 of the License, or
+	(at your option) any later version.
+
+	solidity is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include <test/TestCase.h>
+#include <test/libsolidity/ASTJSONTest.h>
+#include <test/libsolidity/SyntaxTest.h>
+#include <test/libsolidity/SMTCheckerJSONTest.h>
+#include <test/libyul/YulOptimizerTest.h>
+#include <test/libyul/ObjectCompilerTest.h>
+
+#include <boost/filesystem.hpp>
+
+namespace dev
+{
+namespace solidity
+{
+namespace test
+{
+
+/** Container for all information regarding a testsuite */
+struct Testsuite
+{
+	char const* title;
+	boost::filesystem::path const path;
+	boost::filesystem::path const subpath;
+	bool smt;
+	bool ipc;
+	TestCase::TestCaseCreator testCaseCreator;
+};
+
+
+/// Array of testsuits that can be run interactively as well as automatically
+Testsuite const g_interactiveTestsuites[] = {
+/*
+	Title                  Path            Subpath                SMT    IPC    Creator function */
+	{"Yul Optimizer",       "libyul",      "yulOptimizerTests",   false, false, &yul::test::YulOptimizerTest::create},
+	{"Yul Object Compiler", "libyul",      "objectCompiler",      false, false, &yul::test::ObjectCompilerTest::create},
+	{"Syntax",              "libsolidity", "syntaxTests",         false, false, &SyntaxTest::create},
+	{"JSON AST",            "libsolidity", "ASTJSON",             false, false, &ASTJSONTest::create},
+	{"SMT Checker",         "libsolidity", "smtCheckerTests",     true,  false, &SyntaxTest::create},
+	{"SMT Checker JSON",    "libsolidity", "smtCheckerTestsJSON", true,  false, &SMTCheckerTest::create}
+};
+
+}
+}
+}
+
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index ff443d11..034aaef3 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -35,16 +35,13 @@
 
 #pragma GCC diagnostic pop
 
+#include <test/InteractiveTests.h>
 #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 <test/libyul/ObjectCompilerTest.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
+#include <string>
 
 using namespace boost::unit_test;
 using namespace dev::solidity::test;
@@ -129,46 +126,26 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 	master_test_suite_t& master = framework::master_test_suite();
 	master.p_name.value = "SolidityTests";
 	dev::test::Options::get().validate();
-	solAssert(registerTests(
-		master,
-		dev::test::Options::get().testPath / "libsolidity",
-		"syntaxTests",
-		SyntaxTest::create
-	) > 0, "no syntax tests found");
-	solAssert(registerTests(
-		master,
-		dev::test::Options::get().testPath / "libsolidity",
-		"ASTJSON",
-		ASTJSONTest::create
-	) > 0, "no JSON AST tests found");
-	solAssert(registerTests(
-		master,
-		dev::test::Options::get().testPath / "libyul",
-		"yulOptimizerTests",
-		yul::test::YulOptimizerTest::create
-	) > 0, "no Yul Optimizer tests found");
-	solAssert(registerTests(
-		master,
-		dev::test::Options::get().testPath / "libyul",
-		"objectCompiler",
-		yul::test::ObjectCompilerTest::create
-	) > 0, "no Yul Object compiler tests found");
-	if (!dev::test::Options::get().disableSMT)
+
+	// Include the interactive tests in the automatic tests as well
+	for (auto const& ts: g_interactiveTestsuites)
 	{
-		solAssert(registerTests(
-			master,
-			dev::test::Options::get().testPath / "libsolidity",
-			"smtCheckerTests",
-			SyntaxTest::create
-		) > 0, "no SMT checker tests found");
+		auto const& options = dev::test::Options::get();
+
+		if (ts.smt && options.disableSMT)
+			continue;
+
+		if (ts.ipc && options.disableIPC)
+			continue;
 
 		solAssert(registerTests(
 			master,
-			dev::test::Options::get().testPath / "libsolidity",
-			"smtCheckerTestsJSON",
-			SMTCheckerTest::create
-		) > 0, "no SMT checker JSON tests found");
+			options.testPath / ts.path,
+			ts.subpath,
+			ts.testCaseCreator
+		) > 0, std::string("no ") + ts.title + " tests found");
 	}
+
 	if (dev::test::Options::get().disableIPC)
 	{
 		for (auto suite: {
@@ -188,6 +165,7 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 		})
 			removeTestSuite(suite);
 	}
+
 	if (dev::test::Options::get().disableSMT)
 		removeTestSuite("SMTChecker");
 
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 13585887..e5578045 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -19,11 +19,7 @@
 
 #include <test/Common.h>
 #include <test/libsolidity/AnalysisFramework.h>
-#include <test/libsolidity/SyntaxTest.h>
-#include <test/libsolidity/ASTJSONTest.h>
-#include <test/libsolidity/SMTCheckerJSONTest.h>
-#include <test/libyul/YulOptimizerTest.h>
-#include <test/libyul/ObjectCompilerTest.h>
+#include <test/InteractiveTests.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -380,59 +376,13 @@ Allowed options)",
 	TestStats global_stats{0, 0};
 
 	// Actually run the tests.
-	// If you add new tests here, you also have to add them in boostTest.cpp
-	if (auto stats = runTestSuite("Syntax", testPath / "libsolidity", "syntaxTests", SyntaxTest::create, formatted))
-		global_stats += *stats;
-	else
-		return 1;
-
-	if (auto stats = runTestSuite("JSON AST", testPath / "libsolidity", "ASTJSON", ASTJSONTest::create, formatted))
-		global_stats += *stats;
-	else
-		return 1;
-
-	if (auto stats = runTestSuite(
-		"Yul Optimizer",
-		testPath / "libyul",
-		"yulOptimizerTests",
-		yul::test::YulOptimizerTest::create,
-		formatted
-	))
-		global_stats += *stats;
-	else
-		return 1;
-
-	if (auto stats = runTestSuite(
-		"Yul Object Compiler",
-		testPath / "libyul",
-		"objectCompiler",
-		yul::test::ObjectCompilerTest::create,
-		formatted
-	))
-		global_stats += *stats;
-	else
-		return 1;
-
-	if (!disableSMT)
+	// Interactive tests are added in InteractiveTests.h
+	for (auto const& ts: g_interactiveTestsuites)
 	{
-		if (auto stats = runTestSuite(
-			"SMT Checker",
-			testPath / "libsolidity",
-			"smtCheckerTests",
-			SyntaxTest::create,
-			formatted
-		))
-			global_stats += *stats;
-		else
-			return 1;
+		if (ts.smt && disableSMT)
+			continue;
 
-		if (auto stats = runTestSuite(
-			"SMT Checker JSON",
-			testPath / "libsolidity",
-			"smtCheckerTestsJSON",
-			SMTCheckerTest::create,
-			formatted
-		))
+		if (auto stats = runTestSuite(ts.title, testPath / ts.path, ts.subpath, ts.testCaseCreator, formatted))
 			global_stats += *stats;
 		else
 			return 1;