Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

functional_tests: crypto_tests: tests wildcard filtering added

Browse source
This commit is contained in:
sowle 2021-02-15 15:48:50 +03:00
parent 60973109e1
commit 40c52edf26
No known key found for this signature in database
GPG key ID: C07A24B2D89D49FC
3 changed files with 42 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
tests/functional_tests/crypto_tests.cpp
View file

@ -1394,10 +1394,38 @@ TEST(ml2s, hs)
// test's runner
//
int crypto_tests()
bool wildcard_match(const std::string& needle, const std::string& haystack)
{
epee::log_space::get_set_log_detalisation_level(true, LOG_LEVEL_1);
epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_2);
size_t h = 0;
for (size_t n = 0; n < needle.size(); ++n)
{
switch (needle[n])
{
case '?':
if (h == haystack.size())
return false;
++h;
break;
case '*':
if (n + 1 == needle.size())
return true;
for (size_t i = 0; i + h < haystack.size(); i++)
if (wildcard_match(needle.substr(n + 1), haystack.substr(h + i)))
return true;
return false;
default:
if (haystack[h] != needle[n])
return false;
++h;
}
}
return h == haystack.size();
}
int crypto_tests(const std::string& cmd_line_param)
{
epee::log_space::get_set_log_detalisation_level(true, LOG_LEVEL_3);
epee::log_space::log_singletone::add_logger(LOGGER_CONSOLE, NULL, NULL, LOG_LEVEL_3);
epee::log_space::log_singletone::add_logger(LOGGER_FILE,
epee::log_space::log_singletone::get_default_log_file().c_str(),
epee::log_space::log_singletone::get_default_log_folder().c_str());
@ -1408,6 +1436,11 @@ int crypto_tests()
for (size_t i = 0; i < g_tests.size(); ++i)
{
auto& test = g_tests[i];
if (!wildcard_match(cmd_line_param.c_str(), test.first.c_str()))
continue;
LOG_PRINT(" " << std::setw(40) << std::left << test.first << " >", LOG_LEVEL_0);
TIME_MEASURE_START(runtime);
bool r = false;
try
@ -1427,11 +1460,11 @@ int crypto_tests()
uint64_t runtime_mcs = runtime % 1000;
if (r)
{
LOG_PRINT_GREEN(" " << std::setw(40) << std::left << test.first << "OK [" << runtime_ms << "." << std::setw(3) << std::setfill('0') << runtime_mcs << " ms]", LOG_LEVEL_0);
LOG_PRINT_GREEN(" " << std::setw(40) << std::left << test.first << "OK [" << runtime_ms << "." << std::setw(3) << std::setfill('0') << runtime_mcs << " ms]", LOG_LEVEL_0);
}
else
{
LOG_PRINT_RED(ENDL << " " << std::setw(40) << std::left << test.first << "FAILED" << ENDL, LOG_LEVEL_0);
LOG_PRINT_RED(ENDL << " " << std::setw(40) << std::left << test.first << "FAILED" << ENDL, LOG_LEVEL_0);
failed_tests.push_back(i);
}
}

2
tests/functional_tests/crypto_tests.h
View file

@ -3,4 +3,4 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#pragma once
int crypto_tests();
int crypto_tests(const std::string& cmd_line_param);

6
tests/functional_tests/main.cpp
View file

@ -56,7 +56,7 @@ namespace
const command_line::arg_descriptor<bool> arg_deadlock_guard = { "test-deadlock-guard", "Do deadlock guard test", false, true };
const command_line::arg_descriptor<std::string> arg_difficulty_analysis = { "difficulty-analysis", "Do difficulty analysis", "", true };
const command_line::arg_descriptor<bool> arg_test_plain_wallet = { "test-plainwallet", "Do testing of plain wallet interface", false, true };
const command_line::arg_descriptor<bool> arg_crypto_tests = { "crypto-tests", "Run experimental crypto tests", false, true };
const command_line::arg_descriptor<std::string> arg_crypto_tests = { "crypto-tests", "Run experimental crypto tests", "", true };
}
@ -212,9 +212,9 @@ int main(int argc, char* argv[])
}
return 0;
}
else if (command_line::get_arg(vm, arg_crypto_tests))
else if (command_line::has_arg(vm, arg_crypto_tests))
{
return crypto_tests();
return crypto_tests(command_line::get_arg(vm, arg_crypto_tests));
}
else
{