From 0cb6c941bfae83c546ae0478f18adc2d0cd4dabb Mon Sep 17 00:00:00 2001 From: Chris Gundlach Date: Fri, 22 Jul 2022 10:13:06 -0500 Subject: [PATCH] GH-524 took out irrelevant tests --- tests/CMakeLists.txt | 45 ------------------------- unittests/test-contracts/CMakeLists.txt | 1 - 2 files changed, 46 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index cf471385f..6e4f379a8 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -150,54 +150,9 @@ set_tests_properties(db_modes_test PROPERTIES COST 6000) add_test(NAME release-build-test COMMAND tests/release-build.sh WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) add_test(NAME version-label-test COMMAND tests/version-label.sh "v${VERSION_FULL}" WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) add_test(NAME full-version-label-test COMMAND tests/full-version-label.sh "v${VERSION_FULL}" ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -<<<<<<< HEAD -======= -add_test(NAME print-build-info-test COMMAND tests/print-build-info.sh ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -if(NOT EOSIO_REQUIRE_FULL_VALIDATION) - add_test(NAME light_validation_sync_test COMMAND tests/light_validation_sync_test.py -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - 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) -endif() -add_test(NAME privacy_startup_network COMMAND tests/privacy_startup_network.py -p 2 -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_startup_network PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_simple_network COMMAND tests/privacy_simple_network.py -p 2 -n 3 -v --clean-run --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_simple_network PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_tls_test COMMAND tests/privacy_tls_test.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_tls_test PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_scenario_3_test COMMAND tests/privacy_scenario_3_test.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_scenario_3_test PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_forked_network COMMAND tests/privacy_forked_network.py -p 4 -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_forked_network PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_config_test_activate COMMAND tests/privacy_config_test_activate.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_config_test_activate PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_config_test_restart COMMAND tests/privacy_config_test_restart.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_config_test_restart PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_config_test_snapshot COMMAND tests/privacy_config_test_snapshot.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_config_test_snapshot PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_config_test_no_ca COMMAND tests/privacy_config_test_no_ca.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_config_test_no_ca PROPERTY LABELS nonparallelizable_tests) -add_test(NAME privacy_network_from_snapshot COMMAND tests/privacy_network_from_snapshot.py -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST privacy_network_from_snapshot PROPERTY LABELS nonparallelizable_tests) -add_test(NAME read_only_query COMMAND tests/read_only_query_tests.py -p 1 -v --dump-error-detail WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST read_only_query PROPERTY LABELS nonparallelizable_tests) -add_test(NAME cleos_action_no_params COMMAND tests/cleos_action_no_params.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST cleos_action_no_params PROPERTY LABELS nonparallelizable_tests) -add_test(NAME nested_container_kv_test COMMAND tests/nested_container_kv_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) -set_property(TEST nested_container_kv_test PROPERTY LABELS nonparallelizable_tests) add_test(NAME nested_container_multi_index_test COMMAND tests/nested_container_multi_index_test.py WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) set_property(TEST nested_container_multi_index_test PROPERTY LABELS nonparallelizable_tests) -if (ENABLE_RODEOS) - 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) - if("eos-vm-oc" IN_LIST EOSIO_WASM_RUNTIMES) - add_test(NAME rodeos_test_eosvmoc COMMAND tests/rodeos_test.py -v --clean-run --dump-error-detail --eos-vm-oc-enable WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) - set_property(TEST rodeos_test_eosvmoc PROPERTY LABELS nonparallelizable_tests) - endif() -endif() ->>>>>>> da5b3c0ca... Merge pull request #10635 from EOSIO/nested_container_support_set_optional - # 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}) set_property(TEST nodeos_sanity_lr_test PROPERTY LABELS long_running_tests) diff --git a/unittests/test-contracts/CMakeLists.txt b/unittests/test-contracts/CMakeLists.txt index c5d32bfa1..b9494ef1e 100644 --- a/unittests/test-contracts/CMakeLists.txt +++ b/unittests/test-contracts/CMakeLists.txt @@ -39,6 +39,5 @@ add_subdirectory( wasm_config_bios ) add_subdirectory( params_test ) add_subdirectory( crypto_primitives_test ) add_subdirectory( get_block_num_test ) -add_subdirectory( security_group_test ) add_subdirectory( nested_container_kv ) add_subdirectory( nested_container_multi_index )