trusty_unittest: Fix gcc hosttest build
Bug: 79993468
Change-Id: If452ab4506cd0ff6a064d49361a8872f54a499f6
diff --git a/include/user/trusty_unittest.h b/include/user/trusty_unittest.h
index ff6402b..49a96f0 100644
--- a/include/user/trusty_unittest.h
+++ b/include/user/trusty_unittest.h
@@ -56,19 +56,19 @@
/*
* EXPECT_* macros to check test results.
*/
-#define EXPECT_EQ(expected, actual, msg) \
- { \
- __typeof__(actual) _e = expected; \
- __typeof__(actual) _a = actual; \
- _tests_total++; \
- if (_e != _a) { \
- TLOGI("%s: expected " #expected \
- " (%d), " \
- "actual " #actual " (%d)\n", \
- msg, (int)_e, (int)_a); \
- _tests_failed++; \
- _all_ok = false; \
- } \
+#define EXPECT_EQ(expected, actual, msg) \
+ { \
+ __typeof__(actual) _e = expected; \
+ __typeof__(actual) _a = actual; \
+ _tests_total++; \
+ if (_e != _a) { \
+ TLOGI("%s: expected " #expected \
+ " (%ld), " \
+ "actual " #actual " (%ld)\n", \
+ msg, (long)_e, (long)_a); \
+ _tests_failed++; \
+ _all_ok = false; \
+ } \
}
#define EXPECT_NE(expected, actual, msg) \
@@ -78,51 +78,51 @@
_tests_total++; \
if (_e == _a) { \
TLOGI("%s: expected not " #expected \
- " (%d), " \
- "actual " #actual " (%d)\n", \
- msg, (int)_e, (int)_a); \
+ " (%ld), " \
+ "actual " #actual " (%ld)\n", \
+ msg, (long)_e, (long)_a); \
_tests_failed++; \
_all_ok = false; \
} \
}
-#define EXPECT_GT(expected, actual, msg) \
- { \
- __typeof__(actual) _e = expected; \
- __typeof__(actual) _a = actual; \
- _tests_total++; \
- if (_e <= _a) { \
- TLOGI("%s: expected " #expected \
- " (%d), " \
- "actual " #actual " (%d)\n", \
- msg, (int)_e, (int)_a); \
- _tests_failed++; \
- _all_ok = false; \
- } \
+#define EXPECT_GT(expected, actual, msg) \
+ { \
+ __typeof__(actual) _e = expected; \
+ __typeof__(actual) _a = actual; \
+ _tests_total++; \
+ if (_e <= _a) { \
+ TLOGI("%s: expected " #expected \
+ " (%ld), " \
+ "actual " #actual " (%ld)\n", \
+ msg, (long)_e, (long)_a); \
+ _tests_failed++; \
+ _all_ok = false; \
+ } \
}
-#define EXPECT_GE_ZERO(actual, msg) \
- { \
- __typeof__(actual) _a = actual; \
- _tests_total++; \
- if (_a < 0) { \
- TLOGI("%s: expected >= 0 " \
- "actual " #actual " (%d)\n", \
- msg, (int)_a); \
- _tests_failed++; \
- _all_ok = false; \
- } \
+#define EXPECT_GE_ZERO(actual, msg) \
+ { \
+ __typeof__(actual) _a = actual; \
+ _tests_total++; \
+ if (_a < 0) { \
+ TLOGI("%s: expected >= 0 " \
+ "actual " #actual " (%ld)\n", \
+ msg, (long)_a); \
+ _tests_failed++; \
+ _all_ok = false; \
+ } \
}
-#define EXPECT_GT_ZERO(actual, msg) \
- { \
- __typeof__(actual) _a = actual; \
- _tests_total++; \
- if (_a <= 0) { \
- TLOGI("%s: expected > 0 " \
- "actual " #actual " (%d)\n", \
- msg, (int)_a); \
- _tests_failed++; \
- _all_ok = false; \
- } \
+#define EXPECT_GT_ZERO(actual, msg) \
+ { \
+ __typeof__(actual) _a = actual; \
+ _tests_total++; \
+ if (_a <= 0) { \
+ TLOGI("%s: expected > 0 " \
+ "actual " #actual " (%ld)\n", \
+ msg, (long)_a); \
+ _tests_failed++; \
+ _all_ok = false; \
+ } \
}
