diff options
| author | Riccardo Spagni <ric@spagni.net> | 2018-01-27 18:21:40 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2018-01-27 18:21:40 -0800 |
| commit | 00a1166c95ee07523ed2f00ec3f974857d9dbefb (patch) | |
| tree | 06d7c31079939988b09f8437a057c6b9e8ac11b6 | |
| parent | Merge pull request #3123 (diff) | |
| parent | performance_tests: fix build after merging two conflicting patches (diff) | |
| download | monero-00a1166c95ee07523ed2f00ec3f974857d9dbefb.tar.xz | |
Merge pull request #3185
fccd1df1 performance_tests: fix build after merging two conflicting patches (moneromooo-monero)
| -rw-r--r-- | tests/performance_tests/main.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp index aba29ef67..d1b79d026 100644 --- a/tests/performance_tests/main.cpp +++ b/tests/performance_tests/main.cpp @@ -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, 16384); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 3, false); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 5, false); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 10, false); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 100, false); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 3, true); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 5, true); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 10, true); - TEST_PERFORMANCE3(test_ringct_mlsag, 1, 100, true); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 3, false); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 5, false); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 10, false); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 100, false); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 3, true); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 5, true); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 10, true); + TEST_PERFORMANCE3(filter, test_ringct_mlsag, 1, 100, true); std::cout << "Tests finished. Elapsed time: " << timer.elapsed_ms() / 1000 << " sec" << std::endl; |