Modify unit tests to run on-device as well as on the dev machine.
Change-Id: Icdab36a8e4fe97deb112df7ae59e97317f7e991b
diff --git a/authorization_set_test.cpp b/authorization_set_test.cpp
index 8971c6c..590bbe4 100644
--- a/authorization_set_test.cpp
+++ b/authorization_set_test.cpp
@@ -21,12 +21,6 @@
#include "google_keymaster_test_utils.h"
-int main(int argc, char** argv) {
- ::testing::InitGoogleTest(&argc, argv);
- int result = RUN_ALL_TESTS();
- return result;
-}
-
namespace keymaster {
namespace test {
@@ -62,11 +56,11 @@
};
AuthorizationSet set1(params, 0);
- EXPECT_EQ(0, set1.size());
+ EXPECT_EQ(0U, set1.size());
EXPECT_EQ(AuthorizationSet::OK, set1.is_valid());
AuthorizationSet set2(reinterpret_cast<keymaster_key_param_t*>(NULL), array_length(params));
- EXPECT_EQ(0, set2.size());
+ EXPECT_EQ(0U, set2.size());
EXPECT_EQ(AuthorizationSet::OK, set2.is_valid());
}