[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 95875.
kpw added a comment.

My best guess is that the problem is test speed unwriting determinism coupled with
leftover test garbage. This relies on bash being the shell run by RUN, but works
whether or not there is garbage from a previous failure.

Bash traps might be a way to get "finally" like behavior in lit scripts in the future.


https://reviews.llvm.org/D32259

Files:
  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: if compgen -G "fdr-thread-order.*" ; then rm fdr-thread-order.* ; fi
+// 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.


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