Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set cost (priority) to long running tests and split api_tests and wasm_tests #218

Merged
merged 5 commits into from
May 30, 2024
+42 −18
Merged

Set cost (priority) to long running tests and split api_tests and wasm_tests #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c171e6b
Split api_tests and wasm_tests further so that they can finish within…
linh2931 May 29, 2024
27e682d
Add cost (priority) to tests with long running time so they can start…
linh2931 May 29, 2024
0e5253b
Add cost (priority) to tests with long running time so they can start…
linh2931 May 29, 2024
d00f83d
Increase memory_trap_1_check_throw_tests cost to 5000
linh2931 May 29, 2024
2461afe
Increase timeout for nonparallelizable_tests and long_running_tests f…
linh2931 May 29, 2024
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: 1 addition & 1 deletion .github/workflows/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ jobs:
chown -R $(id -u):$(id -g) $PWD
zstdcat build.tar.zst | tar x
cd build
ctest --output-on-failure -j $(nproc) -LE "(nonparallelizable_tests|long_running_tests)" --timeout 420
ctest --output-on-failure -j $(nproc) -LE "(nonparallelizable_tests|long_running_tests)" --timeout 480
- name: Upload core files from failed tests
uses: actions/upload-artifact@v4
if: failure()
Expand Down
14 changes: 9 additions & 5 deletions unittests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,15 @@ foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
set_tests_properties(api_part1_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(api_part2_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(api_part3_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_part1_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(wasm_part2_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(wasm_config_part1_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(wasm_config_part2_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(wasm_config_part3_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(api_part4_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_part1_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_part2_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_part3_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_config_part1_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_config_part2_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(wasm_config_part3_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(snapshot_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(finality_unit_test_${RUNTIME} PROPERTIES COST 4000)
set_tests_properties(delay_unit_test_${RUNTIME} PROPERTIES COST 3000)
endforeach()

Expand Down
20 changes: 12 additions & 8 deletions unittests/api_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -953,6 +953,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(checktime_pass_tests, T, validating_testers) { tr
BOOST_REQUIRE_EQUAL( chain.validate(), true );
} FC_LOG_AND_RETHROW() }

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(api_part2_tests)

template<class T, typename Tester>
void push_trx(Tester& test, T ac, uint32_t billed_cpu_time_us , uint32_t max_cpu_usage_ms, uint32_t max_block_cpu_ms,
bool explicit_bill, std::vector<char> payload = {}, name account = "testapi"_n, transaction_metadata::trx_type trx_type = transaction_metadata::trx_type::input ) {
Expand Down Expand Up @@ -1426,10 +1430,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(checktime_start, T, validating_testers) try {
deadline_exception, is_deadline_exception );
} FC_LOG_AND_RETHROW()

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(api_part2_tests)

/*************************************************************************************
* transaction_tests common function
*************************************************************************************/
Expand Down Expand Up @@ -1704,6 +1704,10 @@ BOOST_AUTO_TEST_CASE(deferred_inline_action_limit) { try {

} FC_LOG_AND_RETHROW() }

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(api_part3_tests)

BOOST_FIXTURE_TEST_CASE(deferred_transaction_tests, validating_tester_no_disable_deferred_trx) { try {
produce_blocks(2);
create_accounts( {"testapi"_n, "testapi2"_n, "alice"_n} );
Expand Down Expand Up @@ -2592,10 +2596,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(memory_tests, T, validating_testers) {
pushit("memset"_n, name());
}

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(api_part3_tests)

static const char cstr_wast[] = R"======(
(module
(import "env" "eosio_assert" (func $eosio_assert (param i32 i32)))
Expand Down Expand Up @@ -2961,6 +2961,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(resource_limits_tests, T, validating_testers) {
BOOST_CHECK_THROW(pushit(), wasm_exception);
}

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(api_part4_tests)

BOOST_AUTO_TEST_CASE( set_producers_legacy ) { try {
fc::temp_directory tempdir;
validating_tester t( tempdir, true );
Expand Down
12 changes: 12 additions & 0 deletions unittests/wasm-spec-tests/generated-tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,15 @@ foreach(TEST_SUITE ${WASM_TESTS}) # create an independent target for each test s
endif()
endforeach(TEST_SUITE)
set(ctest_tests "'${ctest_tests}' -j8") # surround test list string in apostrophies

# The following tests are known to take the longest, bump up their cost (priority) so that they'll run first
# even on fresh first time test runs before ctest auto-detects costs
foreach(RUNTIME ${EOSIO_WASM_RUNTIMES})
set_tests_properties(memory_trap_1_check_throw_unit_test_${RUNTIME} PROPERTIES COST 5000)
set_tests_properties(conversions_0_check_throw_unit_test_${RUNTIME} PROPERTIES COST 2500)
set_tests_properties(unreachable_0_check_throw_unit_test_${RUNTIME} PROPERTIES COST 2500)
set_tests_properties(f64_0_pass_unit_test_${RUNTIME} PROPERTIES COST 2500)
set_tests_properties(f32_0_pass_unit_test_${RUNTIME} PROPERTIES COST 2500)
set_tests_properties(f32_cmp_0_pass_unit_test_${RUNTIME} PROPERTIES COST 2500)
set_tests_properties(f64_cmp_0_pass_unit_test_${RUNTIME} PROPERTIES COST 2500)
endforeach()
12 changes: 8 additions & 4 deletions unittests/wasm_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -798,6 +798,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( table_init_oob, T, validating_testers ) try {

} FC_LOG_AND_RETHROW()

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(wasm_part2_tests)

BOOST_AUTO_TEST_CASE_TEMPLATE( memory_init_border, T, validating_testers ) try {
T chain;

Expand Down Expand Up @@ -1270,10 +1274,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( check_big_deserialization, T, validating_testers

} FC_LOG_AND_RETHROW()

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(wasm_part2_tests)

BOOST_AUTO_TEST_CASE_TEMPLATE( check_table_maximum, T, validating_testers ) try {
T chain;

Expand Down Expand Up @@ -1755,6 +1755,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE( fuzz, T, validating_testers ) try {
chain.produce_blocks(1);
} FC_LOG_AND_RETHROW()

BOOST_AUTO_TEST_SUITE_END()

BOOST_AUTO_TEST_SUITE(wasm_part3_tests)

BOOST_AUTO_TEST_CASE_TEMPLATE( big_maligned_host_ptr, T, validating_testers ) try {
T chain;

Expand Down
Loading