diff options
| author | chriseth <chris@ethereum.org> | 2018-11-14 18:11:41 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-14 18:11:41 +0800 |
| commit | 17e81c6ecabe3be8f0553e13ab93393d7315a4d0 (patch) | |
| tree | ec9c1a0c5f4b2202e30b43106aa5f79cc86f2338 /test | |
| parent | bf5b94587f5a6d4d631b91081608498a71362cf1 (diff) | |
| parent | 74553efb69cedbd5b24e6594df0fbf525718659d (diff) | |
| download | dexon-solidity-17e81c6ecabe3be8f0553e13ab93393d7315a4d0.tar.gz dexon-solidity-17e81c6ecabe3be8f0553e13ab93393d7315a4d0.tar.zst dexon-solidity-17e81c6ecabe3be8f0553e13ab93393d7315a4d0.zip | |
Merge pull request #5410 from ethereum/lll-build
Do not build LLL unless requested via the LLL cmake option
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | test/boostTest.cpp | 2 | ||||
| -rw-r--r-- | test/liblll/LLL_ENS.cpp (renamed from test/contracts/LLL_ENS.cpp) | 0 | ||||
| -rw-r--r-- | test/liblll/LLL_ERC20.cpp (renamed from test/contracts/LLL_ERC20.cpp) | 0 |
4 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" diff --git a/test/contracts/LLL_ENS.cpp b/test/liblll/LLL_ENS.cpp index cfd6970c..cfd6970c 100644 --- a/test/contracts/LLL_ENS.cpp +++ b/test/liblll/LLL_ENS.cpp diff --git a/test/contracts/LLL_ERC20.cpp b/test/liblll/LLL_ERC20.cpp index 6c6762dd..6c6762dd 100644 --- a/test/contracts/LLL_ERC20.cpp +++ b/test/liblll/LLL_ERC20.cpp |