Mirrors
/
wownero
mirror of https://git.wownero.com/wownero/wownero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5046 

524bf750 core_tests: add a --list_tests command line switch (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2019-01-18 19:00:15 +02:00
parent 13b12973d1 524bf750c0
commit 08f08beede
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/core_tests/chaingen.h
View File

@ -669,7 +669,9 @@ inline bool do_replay_file(const std::string& filename)
} }
#define GENERATE_AND_PLAY(genclass) \ #define GENERATE_AND_PLAY(genclass) \
if (filter.empty() || boost::regex_match(std::string(#genclass), match, boost::regex(filter))) \ if (list_tests) \
std::cout << #genclass << std::endl; \
else if (filter.empty() || boost::regex_match(std::string(#genclass), match, boost::regex(filter))) \
{ \ { \
std::vector<test_event_entry> events; \ std::vector<test_event_entry> events; \
++tests_count; \ ++tests_count; \

14
tests/core_tests/chaingen_main.cpp
View File

@ -44,6 +44,7 @@ namespace
const command_line::arg_descriptor<bool> arg_generate_and_play_test_data = {"generate_and_play_test_data", ""}; const command_line::arg_descriptor<bool> arg_generate_and_play_test_data = {"generate_and_play_test_data", ""};
const command_line::arg_descriptor<bool> arg_test_transactions = {"test_transactions", ""}; const command_line::arg_descriptor<bool> arg_test_transactions = {"test_transactions", ""};
const command_line::arg_descriptor<std::string> arg_filter = { "filter", "Regular expression filter for which tests to run" }; const command_line::arg_descriptor<std::string> arg_filter = { "filter", "Regular expression filter for which tests to run" };
const command_line::arg_descriptor<bool> arg_list_tests = {"list_tests", ""};
} }
int main(int argc, char* argv[]) int main(int argc, char* argv[])
@ -64,6 +65,7 @@ int main(int argc, char* argv[])
command_line::add_arg(desc_options, arg_generate_and_play_test_data); command_line::add_arg(desc_options, arg_generate_and_play_test_data);
command_line::add_arg(desc_options, arg_test_transactions); command_line::add_arg(desc_options, arg_test_transactions);
command_line::add_arg(desc_options, arg_filter); command_line::add_arg(desc_options, arg_filter);
command_line::add_arg(desc_options, arg_list_tests);
po::variables_map vm; po::variables_map vm;
bool r = command_line::handle_error_helper(desc_options, [&]() bool r = command_line::handle_error_helper(desc_options, [&]()
@ -87,6 +89,7 @@ int main(int argc, char* argv[])
size_t tests_count = 0; size_t tests_count = 0;
std::vector<std::string> failed_tests; std::vector<std::string> failed_tests;
std::string tests_folder = command_line::get_arg(vm, arg_test_data_path); std::string tests_folder = command_line::get_arg(vm, arg_test_data_path);
bool list_tests = false;
if (command_line::get_arg(vm, arg_generate_test_data)) if (command_line::get_arg(vm, arg_generate_test_data))
{ {
GENERATE("chain001.dat", gen_simple_chain_001); GENERATE("chain001.dat", gen_simple_chain_001);
@ -95,7 +98,7 @@ int main(int argc, char* argv[])
{ {
PLAY("chain001.dat", gen_simple_chain_001); PLAY("chain001.dat", gen_simple_chain_001);
} }
else if (command_line::get_arg(vm, arg_generate_and_play_test_data)) else if (command_line::get_arg(vm, arg_generate_and_play_test_data) || (list_tests = command_line::get_arg(vm, arg_list_tests)))
{ {
GENERATE_AND_PLAY(gen_simple_chain_001); GENERATE_AND_PLAY(gen_simple_chain_001);
GENERATE_AND_PLAY(gen_simple_chain_split_1); GENERATE_AND_PLAY(gen_simple_chain_split_1);
@ -251,9 +254,12 @@ int main(int argc, char* argv[])
GENERATE_AND_PLAY(gen_bp_tx_invalid_borromean_type); GENERATE_AND_PLAY(gen_bp_tx_invalid_borromean_type);
el::Level level = (failed_tests.empty() ? el::Level::Info : el::Level::Error); el::Level level = (failed_tests.empty() ? el::Level::Info : el::Level::Error);
MLOG(level, "\nREPORT:"); if (!list_tests)
MLOG(level, " Test run: " << tests_count); {
MLOG(level, " Failures: " << failed_tests.size()); MLOG(level, "\nREPORT:");
MLOG(level, " Test run: " << tests_count);
MLOG(level, " Failures: " << failed_tests.size());
}
if (!failed_tests.empty()) if (!failed_tests.empty())
{ {
MLOG(level, "FAILED TESTS:"); MLOG(level, "FAILED TESTS:");