Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

disable building rodeos and eosio.tester #9670

Merged
merged 4 commits into from
Nov 16, 2020
Merged

disable building rodeos and eosio.tester #9670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fff0f05
disable building rodeos and eosio.tester
linhuang-blockone Nov 15, 2020
8e65f23
disable rodeos_test
linhuang-blockone Nov 15, 2020
246dfaa
Fix snapshot_tests and test_state_history failures
linhuang-blockone Nov 16, 2020
616717f
remove boost::wrapexcept
linhuang-blockone Nov 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libraries/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ set_property(GLOBAL PROPERTY CTEST_CUSTOM_TESTS_IGNORE
yubico_otp wrap_data wrap info import_rsa import_authkey generate_hmac generate_ec\
attest pbkdf2 parsing ${_CTEST_CUSTOM_TESTS_IGNORE}")

add_subdirectory( rodeos )
linhuang-blockone marked this conversation as resolved.
Show resolved Hide resolved

find_package(OpenSSL REQUIRED)
option(AMQP-CPP_LINUX_TCP CACHE ON)
add_subdirectory( amqp-cpp EXCLUDE_FROM_ALL )
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/backing_store/tests/benchmark_kv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ int main(int argc, char* argv[]) {
return 1;
}
}
} catch (boost::wrapexcept<boost::program_options::required_option>& ex) {
} catch (boost::program_options::required_option& ex) {
// This exception is thrown whenever required options are not supplied.
// Need to catch it or we will get a crash.
if (vmap.count("help") == 0) {
Expand Down
2 changes: 1 addition & 1 deletion libraries/chain/include/eosio/chain/backing_store/db_combined.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ class rocksdb_whole_db_table_collector {
all_secondary_indices_;
};

auto process_all = []() { return true; };
constexpr auto process_all = []() { return true; };

enum class key_context { complete, standalone };
template<typename Receiver, typename Function = std::decay_t < decltype(process_all)>>
Expand Down
2 changes: 0 additions & 2 deletions programs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,3 @@ add_subdirectory( keosd )
add_subdirectory( eosio-launcher )
add_subdirectory( eosio-blocklog )
add_subdirectory( nodeos-sectl )
add_subdirectory( rodeos )
add_subdirectory( eosio-tester )
3 changes: 0 additions & 3 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/eosio_blocklog_prune_test.py ${CMAKE_
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cli_test.py ${CMAKE_CURRENT_BINARY_DIR}/cli_test.py COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/plugin_http_api_test.py ${CMAKE_CURRENT_BINARY_DIR}/plugin_http_api_test.py COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/resource_monitor_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/resource_monitor_plugin_test.py COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/rodeos_test.py ${CMAKE_CURRENT_BINARY_DIR}/rodeos_test.py COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test_filter.wasm ${CMAKE_CURRENT_BINARY_DIR}/test_filter.wasm COPYONLY)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/trace_plugin_test.py ${CMAKE_CURRENT_BINARY_DIR}/trace_plugin_test.py COPYONLY)

Expand Down Expand Up @@ -112,8 +111,6 @@ add_test(NAME light_validation_sync_test COMMAND tests/light_validation_sync_tes
set_property(TEST light_validation_sync_test PROPERTY LABELS nonparallelizable_tests)
add_test(NAME eosio_blocklog_prune_test COMMAND tests/eosio_blocklog_prune_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST eosio_blocklog_prune_test PROPERTY LABELS nonparallelizable_tests)
add_test(NAME rodeos_test COMMAND tests/rodeos_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST rodeos_test PROPERTY LABELS nonparallelizable_tests)

# Long running tests
add_test(NAME nodeos_sanity_lr_test COMMAND tests/nodeos_run_test.py -v --sanity-test --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
Expand Down