From fccd1df12568a43f641e082c6a969b66beb96d1b Mon Sep 17 00:00:00 2001 From: moneromooo-monero Date: Fri, 26 Jan 2018 10:09:59 +0000 Subject: [PATCH] performance_tests: fix build after merging two conflicting patches --- tests/performance_tests/main.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp index 51061dd6f..aeb15c4e6 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;