From 107ffc9a4a19543a2d93986ec20de525ec343d25 Mon Sep 17 00:00:00 2001
From: Stephen Crane <sjc@immunant.com>
Date: Wed, 2 Oct 2024 15:16:42 -0700
Subject: [PATCH] Enable tests that are working now and disable all tests we
 expect to fail due to not enforcing MTE

---
 tests/CMakeLists.txt | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index b154c77fc..af2918ec6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -40,7 +40,6 @@ endif()
 set_target_properties(check PROPERTIES FOLDER "tests")
 
 add_subdirectory(abi)
-add_subdirectory(destructors)
 # add_subdirectory(ffmpeg)
 add_subdirectory(header_includes)
 # add_subdirectory(libusb)
@@ -52,35 +51,38 @@ add_subdirectory(minimal_no_criterion)
 # TODO: support C++ namespaces
 #add_subdirectory(namespaces)
 add_subdirectory(recursion)
-add_subdirectory(ro_sharing)
 # We don't actually compile the `omit_wrappers` test, but it is picked up by LIT.
 add_subdirectory(shared_data)
-add_subdirectory(should_segfault)
-add_subdirectory(trusted_direct)
-add_subdirectory(untrusted_indirect)
-add_subdirectory(two_keys_minimal)
-add_subdirectory(two_shared_ranges)
 add_subdirectory(global_fn_ptr)
+add_subdirectory(read_config)
+add_subdirectory(rewrite_fn_ptr_eq)
 add_subdirectory(rewrite_macros)
 add_subdirectory(sighandler)
+add_subdirectory(simple1)
 add_subdirectory(structs)
-add_subdirectory(heap_two_keys)
-add_subdirectory(three_keys_minimal)
+
 # The following tests are not supported on ARM64 yet
 if (NOT LIBIA2_AARCH64)
-    # strange bug with indirect calls
-    add_subdirectory(read_config)
+    # Expected to have compartment violations, but we aren't enforcing yet:
+    add_subdirectory(destructors)
+    add_subdirectory(ro_sharing)
+    add_subdirectory(should_segfault)
+    add_subdirectory(trusted_direct)
+    add_subdirectory(untrusted_indirect)
+    add_subdirectory(two_keys_minimal)
+    add_subdirectory(two_shared_ranges)
+    add_subdirectory(heap_two_keys)
+    add_subdirectory(three_keys_minimal)
+    add_subdirectory(trusted_indirect)
+
+    # test calls PKRU-specific functions
+    add_subdirectory(mmap_loop)
+    add_subdirectory(tls_protected)
+
     # ARM does not support threads yet
     add_subdirectory(threads)
     add_subdirectory(protected_threads)
-    # test calls PKRU-specific functions for logging
-    add_subdirectory(tls_protected)
+    
     # no permissive mode on ARM
     add_subdirectory(permissive_mode)
-    # not sure why this is failing
-    add_subdirectory(mmap_loop)
-    # we don't support call gates for indirect transitions yet
-    add_subdirectory(simple1)
-    add_subdirectory(trusted_indirect)
-    add_subdirectory(rewrite_fn_ptr_eq)
 endif()