trusty: tests: use GTEST_SKIP() where tests aren't supported am: 0daff94f84

Original change: https://android-review.googlesource.com/c/trusty/lk/trusty/+/2936719

Change-Id: I4a6e2b4c57e50d4e97381ea4a42a5f51a802590c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

3 files changed, 20 insertions, 16 deletions

diff --git a/app/btitest/btitest.c b/app/btitest/btitest.c
index fde5e1f..f2e1c73 100644
--- a/app/btitest/btitest.c
+++ b/app/btitest/btitest.c
@@ -69,10 +69,11 @@ static int bti_trap_code(void) {
 
 TEST(btitest, supported) {
     if (!arch_bti_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] BTI is not supported\n");
-        return;
+        trusty_unittest_printf("[   INFO   ] BTI is not supported\n");
+        GTEST_SKIP();
     }
     EXPECT_EQ(true, arch_bti_supported());
+test_abort:;
 }
 
 /* Smoke-test the callee functions; they should return 0 when called with BL */
@@ -126,8 +127,8 @@ TEST(btitest, bti_jc) {
 
 TEST(btitest, pacisp) {
     if (!arch_pac_address_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] PAC is not supported\n");
-        return;
+        trusty_unittest_printf("[   INFO   ] PAC is not supported\n");
+        GTEST_SKIP();
     }
 
     /* PACIASP is a valid target for all branch types */
@@ -141,6 +142,7 @@ TEST(btitest, pacisp) {
     EXPECT_EQ(0, btitest_br_x16(BTITEST_CALLEE_PACIBSP));
     EXPECT_EQ(0, btitest_br_x17(BTITEST_CALLEE_PACIBSP));
     EXPECT_EQ(0, btitest_blr(BTITEST_CALLEE_PACIBSP));
+test_abort:;
 }
 
 PORT_TEST(btitest, "com.android.kernel.btitest");
diff --git a/app/mmutest/mmutest.c b/app/mmutest/mmutest.c
index e14a54f..d379792 100644
--- a/app/mmutest/mmutest.c
+++ b/app/mmutest/mmutest.c
@@ -677,10 +677,11 @@ TEST(mmutest, DISABLED_ON_ARM_NAME(rodata_ro)) {
 
 TEST(mmutest, pan) {
     if (!mmutest_arch_pan_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] PAN is not supported\n");
-        return;
+        trusty_unittest_printf("[   INFO   ] PAN is not supported\n");
+        GTEST_SKIP();
     }
     EXPECT_EQ(true, mmutest_arch_pan_enabled());
+test_abort:;
 }
 
 TEST(mmutest, store_kernel) {
diff --git a/app/pactest/pactest.c b/app/pactest/pactest.c
index 2155e54..92d541f 100644
--- a/app/pactest/pactest.c
+++ b/app/pactest/pactest.c
@@ -134,8 +134,8 @@ static const char* get_pac_features(uint8_t nibble) {
 
 TEST(pactest, pauth_supported) {
     if (!arch_pac_address_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] PAuth is not supported\n");
-        return;
+        trusty_unittest_printf("[   INFO   ] PAuth is not supported\n");
+        GTEST_SKIP();
     }
 
     const uint64_t isar1 = ARM64_READ_SYSREG(id_aa64isar1_el1);
@@ -169,6 +169,7 @@ TEST(pactest, pauth_supported) {
     /* Log the support in case later trying to debug a test */
     trusty_unittest_printf("[   INFO   ] algo: %s\n", algo);
     trusty_unittest_printf("[   INFO   ] feat: %s%s\n", features, cpf);
+test_abort:;
 }
 
 TEST(pactest, fpac_supported) {
@@ -176,12 +177,13 @@ TEST(pactest, fpac_supported) {
     int rc;
 
     if (!arch_pac_exception_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] FPAC is not supported\n");
-        return;
+        trusty_unittest_printf("[   INFO   ] FPAC is not supported\n");
+        GTEST_SKIP();
     }
 
     rc = pactest_autia(PACTEST_TT0_ADDRESS, PACTEST_MODIFIER, &val);
     EXPECT_EQ(rc, ERR_FAULT);
+test_abort:;
 }
 
 TEST(pactest, enabled) {
@@ -197,8 +199,7 @@ TEST(pactest, enabled) {
 
 TEST(pactest, keys) {
     if (!arch_pac_address_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] PAuth is not supported\n");
-        return;
+        GTEST_SKIP();
     }
 
     const struct packeys* thread_keys = &get_current_thread()->arch.packeys;
@@ -216,6 +217,7 @@ TEST(pactest, keys) {
     EXPECT_NE(UINT64_MAX, keyi_hi);
     EXPECT_NE(0, keyi_lo);
     EXPECT_NE(0, keyi_hi);
+test_abort:;
 }
 
 typedef struct {
@@ -268,8 +270,7 @@ INSTANTIATE_TEST_SUITE_P(pac,
 
 TEST_P(pactest, instr) {
     if (!arch_pac_address_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] PAuth is not supported\n");
-        return;
+        GTEST_SKIP();
     }
 
     const uint64_t test_address = _state->translation_table
@@ -316,12 +317,12 @@ TEST_P(pactest, instr) {
         EXPECT_EQ(rc, 0)
         EXPECT_EQ(test_address, address);
     }
+test_abort:;
 }
 
 TEST_P(pactest, pac_length) {
     if (!arch_pac_address_supported()) {
-        trusty_unittest_printf("[  SKIPPED ] PAuth is not supported\n");
-        return;
+        GTEST_SKIP();
     }
 
     uint8_t top = 0, bot = 64;