Index: test/xray/TestCases/Linux/fdr-thread-order.cc
===================================================================
--- test/xray/TestCases/Linux/fdr-thread-order.cc
+++ test/xray/TestCases/Linux/fdr-thread-order.cc
@@ -5,6 +5,8 @@
 // FIXME: Make llvm-xray work on non-x86_64 as well.
 // REQUIRES: x86_64-linux
 // REQUIRES: built-in-llvm-tree
+// XFAIL: *
+// FIXME: Not currently printing traces from both threads. Root cause the issue.
 
 #include "xray/xray_log_interface.h"
 #include <thread>
Index: test/xray/lit.site.cfg.in
===================================================================
--- test/xray/lit.site.cfg.in
+++ test/xray/lit.site.cfg.in
@@ -5,8 +5,11 @@
 config.xray_lit_source_dir = "@XRAY_LIT_SOURCE_DIR@"
 config.target_cflags = "@XRAY_TEST_TARGET_CFLAGS@"
 config.target_arch = "@XRAY_TEST_TARGET_ARCH@"
-config.built_with_llvm = ("@COMPILER_RT_STANDALONE_BUILD@" == "FALSE")
+config.built_with_llvm = ("@COMPILER_RT_STANDALONE_BUILD@" != "TRUE")
 
+# TODO: Look into whether we can run a capability test on the standalone build to
+# see whether it can run 'llvm-xray convert' instead of turning off tests for a
+# standalone build.
 if config.built_with_llvm:
   config.available_features.add('built-in-llvm-tree')