[compiler-rt] r300716 - Skip tests that use 'llvm_xray' for standalone builds.

[Keith Wyss via llvm-commits]

Author: kpw
Date: Wed Apr 19 12:20:47 2017
New Revision: 300716

URL: http://llvm.org/viewvc/llvm-project?rev=300716&view=rev
Log:
Skip tests that use 'llvm_xray' for standalone builds.

Summary:
Tests that generate output with compiler-rt and verify it with the llvm_xray
command (built from the llvm tree) are extremely convenient, but compiler-rt
can be built out of tree and llvm_xray is not built for every target.

This change intends to disable tests for out of tree builds, but does nothing
to detect whether llvm_xray can be found elsewhere on the path, is fresh enough,
or is part of a build target for the in tree build.

Tested:
  Tested that this didn't break check-xray. Haven't reproduced bots or standalone
  builds.

Reviewers: dberris, kcc

Subscribers: llvm-commits

Differential Revision: https://reviews.llvm.org/D32150

Modified:
    compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc
    compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc
    compiler-rt/trunk/test/xray/lit.site.cfg.in

Modified: compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc?rev=300716&r1=300715&r2=300716&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Linux/fdr-mode.cc Wed Apr 19 12:20:47 2017
@@ -7,6 +7,7 @@
 // RUN: rm fdr-unwrite-test-*
 // FIXME: Make llvm-xray work on non-x86_64 as well.
 // REQUIRES: x86_64-linux
+// REQUIRES: built-in-llvm-tree
 
 #include "xray/xray_log_interface.h"
 #include <cassert>

Modified: compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc?rev=300716&r1=300715&r2=300716&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc (original)
+++ compiler-rt/trunk/test/xray/TestCases/Linux/fdr-thread-order.cc Wed Apr 19 12:20:47 2017
@@ -4,6 +4,8 @@
 // RUN: rm fdr-thread-order.*
 // FIXME: Make llvm-xray work on non-x86_64 as well.
 // REQUIRES: x86_64-linux
+// REQUIRES: built-in-llvm-tree
+
 #include "xray/xray_log_interface.h"
 #include <thread>
 #include <cassert>

Modified: compiler-rt/trunk/test/xray/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/xray/lit.site.cfg.in?rev=300716&r1=300715&r2=300716&view=diff
==============================================================================
--- compiler-rt/trunk/test/xray/lit.site.cfg.in (original)
+++ compiler-rt/trunk/test/xray/lit.site.cfg.in Wed Apr 19 12:20:47 2017
@@ -5,6 +5,10 @@ config.name_suffix = "@XRAY_TEST_CONFIG_
 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")
+
+if config.built_with_llvm:
+  config.available_features.add('built-in-llvm-tree')
 
 # Load common config for all compiler-rt lit tests
 lit_config.load_config(config, "@COMPILER_RT_BINARY_DIR@/test/lit.common.configured")