aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--test/CMakeLists.txt13
-rw-r--r--test/boostTest.cpp2
2 files changed, 12 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 91c1b200..3b674502 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,8 +9,10 @@ file(GLOB libevmasm_sources "libevmasm/*.cpp")
file(GLOB libevmasm_headers "libevmasm/*.h")
file(GLOB libyul_sources "libyul/*.cpp")
file(GLOB libyul_headers "libyul/*.h")
-file(GLOB liblll_sources "liblll/*.cpp")
-file(GLOB liblll_headers "liblll/*.h")
+if (LLL)
+ file(GLOB liblll_sources "liblll/*.cpp")
+ file(GLOB liblll_headers "liblll/*.h")
+endif()
file(GLOB libsolidity_sources "libsolidity/*.cpp")
file(GLOB libsolidity_headers "libsolidity/*.h")
@@ -22,7 +24,12 @@ add_executable(soltest ${sources} ${headers}
${liblll_sources} ${liblll_headers}
${libsolidity_sources} ${libsolidity_headers}
)
-target_link_libraries(soltest PRIVATE libsolc solidity lll evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+target_link_libraries(soltest PRIVATE libsolc solidity evmasm devcore ${Boost_UNIT_TEST_FRAMEWORK_LIBRARIES})
+
+if (LLL)
+ target_link_libraries(soltest PRIVATE lll)
+ target_compile_definitions(soltest PRIVATE HAVE_LLL=1)
+endif()
if (NOT Boost_USE_STATIC_LIBS)
target_compile_definitions(soltest PUBLIC -DBOOST_TEST_DYN_LINK)
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"