3 files changed, 56 insertions, 0 deletions
diff --git a/tests/performance_tests/CMakeLists.txt b/tests/performance_tests/CMakeLists.txt
index 5ec53cd2b..2ecd917c0 100644
--- a/tests/performance_tests/CMakeLists.txt
+++ b/tests/performance_tests/CMakeLists.txt
@@ -39,6 +39,7 @@ set(performance_tests_headers
   generate_key_derivation.h
   generate_key_image.h
   generate_key_image_helper.h
+  generate_keypair.h
   is_out_to_acc.h
   multi_tx_test_base.h
   performance_tests.h
diff --git a/tests/performance_tests/generate_keypair.h b/tests/performance_tests/generate_keypair.h
new file mode 100644
index 000000000..4ba577e2a
--- /dev/null
+++ b/tests/performance_tests/generate_keypair.h
@@ -0,0 +1,51 @@
+// Copyright (c) 2014-2016, The Monero Project
+// 
+// All rights reserved.
+// 
+// Redistribution and use in source and binary forms, with or without modification, are
+// permitted provided that the following conditions are met:
+// 
+// 1. Redistributions of source code must retain the above copyright notice, this list of
+//    conditions and the following disclaimer.
+// 
+// 2. Redistributions in binary form must reproduce the above copyright notice, this list
+//    of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+// 
+// 3. Neither the name of the copyright holder nor the names of its contributors may be
+//    used to endorse or promote products derived from this software without specific
+//    prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+// Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
+
+#pragma once
+
+#include "crypto/crypto.h"
+#include "cryptonote_core/cryptonote_basic.h"
+
+class test_generate_keypair
+{
+public:
+  static const size_t loop_count = 10000;
+
+  bool init()
+  {
+    return true;
+  }
+
+  bool test()
+  {
+    cryptonote::keypair::generate();
+    return true;
+  }
+};
diff --git a/tests/performance_tests/main.cpp b/tests/performance_tests/main.cpp
index d09276230..3f4751ee8 100644
--- a/tests/performance_tests/main.cpp
+++ b/tests/performance_tests/main.cpp
@@ -41,6 +41,7 @@
 #include "generate_key_derivation.h"
 #include "generate_key_image.h"
 #include "generate_key_image_helper.h"
+#include "generate_keypair.h"
 #include "is_out_to_acc.h"
 
 int main(int argc, char** argv)
@@ -51,6 +52,7 @@ int main(int argc, char** argv)
   performance_timer timer;
   timer.start();
 
+goto ree;
   TEST_PERFORMANCE3(test_construct_tx, 1, 1, false);
   TEST_PERFORMANCE3(test_construct_tx, 1, 2, false);
   TEST_PERFORMANCE3(test_construct_tx, 1, 10, false);
@@ -100,6 +102,8 @@ int main(int argc, char** argv)
   TEST_PERFORMANCE0(test_derive_public_key);
   TEST_PERFORMANCE0(test_derive_secret_key);
   TEST_PERFORMANCE0(test_ge_frombytes_vartime);
+ree:
+  TEST_PERFORMANCE0(test_generate_keypair);
 
   TEST_PERFORMANCE0(test_cn_slow_hash);