[PATCH] D32259: [XRay] [compiler-rt] - Fix standalone build test and XFAIL a test.

[Keith via Phabricator via llvm-commits]

kpw updated this revision to Diff 95885.
kpw added a comment.

Using only posix features instead of bash's compdef.

The command will print to stderr, but that's harmless and better than relying on the
location of /dev/null.

Btw, none of the xray tests in the Linux/X86 folder work with the lit internal
shell.
This mostly comes down to the absence of variable assignment for setting flags
on our test invocations. This is actually OK because the tests already target
Linux.


https://reviews.llvm.org/D32259

Files:
  test/xray/TestCases/Linux/fdr-mode.cc
  test/xray/TestCases/Linux/fdr-thread-order.cc
  test/xray/lit.site.cfg.in


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')
 
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
@@ -1,5 +1,6 @@
 // RUN: %clangxx_xray -g -std=c++11 %s -o %t
-// RUN: XRAY_OPTIONS="patch_premain=false xray_naive_log=false xray_logfile_base=fdr-thread-order. xray_fdr_log=true verbosity=1" %run %t 2>&1 | FileCheck %s
+// RUN: rm fdr-thread-order.* || true
+// RUN: XRAY_OPTIONS="patch_premain=false xray_naive_log=false xray_logfile_base=fdr-thread-order. xray_fdr_log=true verbosity=1 xray_fdr_log_func_duration_threshold_us=0" %run %t 2>&1 | FileCheck %s
 // RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t "`ls fdr-thread-order.* | head -1`" | FileCheck %s --check-prefix TRACE
 // RUN: rm fdr-thread-order.*
 // FIXME: Make llvm-xray work on non-x86_64 as well.
Index: test/xray/TestCases/Linux/fdr-mode.cc
===================================================================
--- test/xray/TestCases/Linux/fdr-mode.cc
+++ test/xray/TestCases/Linux/fdr-mode.cc
@@ -1,4 +1,6 @@
 // RUN: %clangxx_xray -g -std=c++11 %s -o %t
+// RUN: rm fdr-logging-test-* || true
+// RUN: rm fdr-unwrite-test-* || true
 // RUN: XRAY_OPTIONS="patch_premain=false xray_naive_log=false xray_logfile_base=fdr-logging-test- xray_fdr_log=true verbosity=1 xray_fdr_log_func_duration_threshold_us=0" %run %t 2>&1 | FileCheck %s
 // RUN: XRAY_OPTIONS="patch_premain=false xray_naive_log=false xray_logfile_base=fdr-unwrite-test- xray_fdr_log=true verbosity=1 xray_fdr_log_func_duration_threshold_us=5000" %run %t 2>&1 | FileCheck %s
 // RUN: %llvm_xray convert --symbolize --output-format=yaml -instr_map=%t "`ls fdr-logging-test-* | head -1`" | FileCheck %s --check-prefix=TRACE


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D32259.95885.patch
Type: text/x-patch
Size: 2550 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170420/6eac1836/attachment.bin>