cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not build tests for LLL if disabled

Browse Source
This commit is contained in:
Alex Beregszaszi 2018-11-13 14:34:19 +00:00
parent b4fcce0bde
commit 6961899cb2
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/CMakeLists.txt
View File

@ -9,8 +9,10 @@ file(GLOB libevmasm_sources "libevmasm/*.cpp")
file(GLOB libevmasm_headers "libevmasm/*.h") file(GLOB libevmasm_headers "libevmasm/*.h")
file(GLOB libyul_sources "libyul/*.cpp") file(GLOB libyul_sources "libyul/*.cpp")
file(GLOB libyul_headers "libyul/*.h") file(GLOB libyul_headers "libyul/*.h")
file(GLOB liblll_sources "liblll/*.cpp") if (LLL)
file(GLOB liblll_headers "liblll/*.h") file(GLOB liblll_sources "liblll/*.cpp")
file(GLOB liblll_headers "liblll/*.h")
endif()
file(GLOB libsolidity_sources "libsolidity/*.cpp") file(GLOB libsolidity_sources "libsolidity/*.cpp")
file(GLOB libsolidity_headers "libsolidity/*.h") file(GLOB libsolidity_headers "libsolidity/*.h")
@ -22,7 +24,12 @@ add_executable(soltest ${sources} ${headers}
${liblll_sources} ${liblll_headers} ${liblll_sources} ${liblll_headers}
${libsolidity_sources} ${libsolidity_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) if (NOT Boost_USE_STATIC_LIBS)
target_compile_definitions(soltest PUBLIC -DBOOST_TEST_DYN_LINK) target_compile_definitions(soltest PUBLIC -DBOOST_TEST_DYN_LINK)

2
test/boostTest.cpp
View File

@ -160,9 +160,11 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
"SolidityAuctionRegistrar", "SolidityAuctionRegistrar",
"SolidityFixedFeeRegistrar", "SolidityFixedFeeRegistrar",
"SolidityWallet", "SolidityWallet",
#if HAVE_LLL
"LLLERC20", "LLLERC20",
"LLLENS", "LLLENS",
"LLLEndToEndTest", "LLLEndToEndTest",
#endif
"GasMeterTests", "GasMeterTests",
"SolidityEndToEndTest", "SolidityEndToEndTest",
"SolidityOptimizer" "SolidityOptimizer"