Index: compiler-rt/trunk/test/xray/TestCases/Linux/patching-unpatching.cc
===================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/patching-unpatching.cc
+++ compiler-rt/trunk/test/xray/TestCases/Linux/patching-unpatching.cc
@@ -3,6 +3,7 @@
 //
 // RUN: %clangxx_xray -fxray-instrument -std=c++11 %s -o %t
 // RUN: XRAY_OPTIONS="patch_premain=false" %run %t 2>&1 | FileCheck %s
+// REQUIRES: stable-runtime
 
 #include "xray/xray_interface.h"
 
Index: compiler-rt/trunk/test/xray/lit.cfg
===================================================================
--- compiler-rt/trunk/test/xray/lit.cfg
+++ compiler-rt/trunk/test/xray/lit.cfg
@@ -32,3 +32,8 @@
 
 if config.host_os not in ['Linux'] or config.host_arch.find('64') == -1:
   config.unsupported = True
+
+# Allow tests to use REQUIRES=stable-runtime.  For use when you cannot use XFAIL
+# e.g. because the test sometimes passes, sometimes fails.
+if config.target_arch != 'aarch64':
+  config.available_features.add('stable-runtime')