commit 72a5fdde1095cc012b232987d1f02de9b0507b89
author Shawn Willden <swillden@google.com> Tue Mar 17 20:04:33 2015 -0600
committer Shawn Willden <swillden@google.com> Fri Apr 10 08:43:52 2015 -0600
tree ef885bd6341fde9aa33ac14f9fa8cdb01f005ade
parent 4a647f2340fb16fce88923dda3202099f72569b2

Modify unit tests to run on-device as well as on the dev machine.

Change-Id: Icdab36a8e4fe97deb112df7ae59e97317f7e991b

google_keymaster_test_utils.cpp

diff --git a/google_keymaster_test_utils.cpp b/google_keymaster_test_utils.cpp
index 8e1f7d3..95d0a5d 100644
--- a/google_keymaster_test_utils.cpp
+++ b/google_keymaster_test_utils.cpp
@@ -212,7 +212,7 @@
     keymaster_error_t error =
         device()->begin(device(), purpose, &blob_, client_params_, array_length(client_params_),
                         &out_params, &out_params_count, &op_handle_);
-    EXPECT_EQ(0, out_params_count);
+    EXPECT_EQ(0U, out_params_count);
     EXPECT_TRUE(out_params == NULL);
     return error;
 }
@@ -235,7 +235,7 @@
         if (output_set) {
             output_set->Reinitialize(out_params, out_params_count);
         } else {
-            EXPECT_EQ(0, out_params_count);
+            EXPECT_EQ(0U, out_params_count);
             EXPECT_TRUE(out_params == NULL);
         }
         keymaster_free_param_values(out_params, out_params_count);
@@ -347,7 +347,7 @@
 void Keymaster1Test::SignMessage(const string& message, string* signature, bool use_client_params) {
     SCOPED_TRACE("SignMessage");
     *signature = ProcessMessage(KM_PURPOSE_SIGN, message, use_client_params);
-    EXPECT_GT(signature->size(), 0);
+    EXPECT_GT(signature->size(), 0U);
 }
 
 void Keymaster1Test::VerifyMessage(const string& message, const string& signature,
@@ -440,7 +440,7 @@
                                      KM_KEY_FORMAT_RAW, key));
     string signature;
     SignMessage(message, &signature);
-    EXPECT_EQ(expected_mac, signature) << "Test vector didn't match for digest " << digest;
+    EXPECT_EQ(expected_mac, signature) << "Test vector didn't match for digest " << (int)digest;
 }
 
 void Keymaster1Test::CheckAesCtrTestVector(const string& key, const string& nonce,