Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3185

Browse Source 
fccd1df1 performance_tests: fix build after merging two conflicting patches (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2018-01-27 18:21:40 -08:00
commit 00a1166c95
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/performance_tests/main.cpp
View File

@ -160,14 +160,14 @@ int main(int argc, char** argv)
TEST_PERFORMANCE1(filter, test_cn_fast_hash, 32); TEST_PERFORMANCE1(filter, test_cn_fast_hash, 32);
TEST_PERFORMANCE1(filter, test_cn_fast_hash, 16384); TEST_PERFORMANCE1(filter, test_cn_fast_hash, 16384);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 3, false); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 3, false);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 5, false); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 5, false);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 10, false); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 10, false);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 100, false); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 100, false);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 3, true); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 3, true);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 5, true); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 5, true);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 10, true); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 10, true);
TEST_PERFORMANCE3(test_ringct_mlsag, 1, 100, true); TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 100, true);
std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl; std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl;