units: remove "performance test" from crypto units

Signed-off-by: Colin McCabe <colin.mccabe@dreamhost.com>

diff --git a/src/test/crypto.cc b/src/test/crypto.cc
index 90e4807f43b2ef3beed6591bbcfaf7dcbdb9809d..88cab9772c1834d0cbcc989883e7b1b3a359e846 100644 (file)
--- a/src/test/crypto.cc
+++ b/src/test/crypto.cc
@@ -110,15 +110,9 @@ TEST(AES, Decrypt) {
   ASSERT_EQ(0, err);
 }
 
-TEST(AES, Benchmark) {
+TEST(AES, Loop) {
   int err;
 
-  struct timespec before;
-  struct timespec after;
-
-  err = clock_gettime(CLOCK_MONOTONIC, &before);
-  ASSERT_EQ(0, err);
-
   char secret_s[16];
   err = get_random_bytes(secret_s, sizeof(secret_s));
   ASSERT_EQ(0, err);
@@ -150,30 +144,8 @@ TEST(AES, Benchmark) {
     }
   }
 
-  err = clock_gettime(CLOCK_MONOTONIC, &after);
-  ASSERT_EQ(0, err);
-
   char plaintext_s[sizeof(orig_plaintext_s)];
   plaintext.copy(0, sizeof(plaintext_s), &plaintext_s[0]);
   err = memcmp(plaintext_s, orig_plaintext_s, sizeof(orig_plaintext_s));
   ASSERT_EQ(0, err);
-
-  // 64 bits of nanoseconds a lot, but nothing guarantees what if any
-  // epoch CLOCK_MONOTONIC has; shift measurements closer to 0 epoch
-  ASSERT_LE(before.tv_sec, after.tv_sec);
-  after.tv_sec -= before.tv_sec;
-  before.tv_sec = 0;
-
-  u_int64_t before_ns = before.tv_sec*1000000000 + before.tv_nsec;
-  u_int64_t after_ns = after.tv_sec*1000000000 + after.tv_nsec;
-  ASSERT_LE(before_ns, after_ns);
-  u_int64_t duration_ns = after_ns - before_ns;
-
-  // my desktop machine completes this in ~200ms with CryptoPP, ~750ms
-  // right now for NSS (too slow!), this allows for 1s before flagging
-  // a problem; not really robust but need something to detect really
-  // severe regressions
-  EXPECT_LT(duration_ns, 1000000000u);
-
-  RecordProperty("durationnanoseconds", duration_ns);
 }