Merge "Initial import of the risc-v uapi headers."
diff --git a/tests/memtag_stack_test.cpp b/tests/memtag_stack_test.cpp
index 1b336bc..84ee8d1 100644
--- a/tests/memtag_stack_test.cpp
+++ b/tests/memtag_stack_test.cpp
@@ -29,7 +29,7 @@
 TEST_P(MemtagStackTest, test) {
 #if defined(__BIONIC__) && defined(__aarch64__)
   if (!mte_supported()) {
-    return;
+    GTEST_SKIP() << "MTE unsupported";
   }
   bool is_static = std::get<1>(GetParam());
   std::string helper =