[compiler-rt] eeba325 - [MemProf] Attempt to debug avr bot failure

[Teresa Johnson via llvm-commits]

Author: Teresa Johnson
Date: 2020-10-23T16:00:08-07:00
New Revision: eeba325b12c4e40ca1ce09788fc5c7dd115fa904

URL: https://github.com/llvm/llvm-project/commit/eeba325b12c4e40ca1ce09788fc5c7dd115fa904
DIFF: https://github.com/llvm/llvm-project/commit/eeba325b12c4e40ca1ce09788fc5c7dd115fa904.diff

LOG: [MemProf] Attempt to debug avr bot failure

Reverts the XFAIL added in b67a2aef8ac9fd9c10666a05d72d909315140dcb,
which had no effect.

Adjust the test to make sure all output is dumped to stderr, so that
hopefully I can get a better idea of where/why this is failing.

Remove some redundant checking while here.

Added: 
    

Modified: 
    compiler-rt/test/memprof/TestCases/log_path_test.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/memprof/TestCases/log_path_test.cpp b/compiler-rt/test/memprof/TestCases/log_path_test.cpp
index 4d9b6445bf16..b3bc43267f80 100644
--- a/compiler-rt/test/memprof/TestCases/log_path_test.cpp
+++ b/compiler-rt/test/memprof/TestCases/log_path_test.cpp
@@ -1,41 +1,28 @@
 // The for loop in the backticks below requires bash.
 // REQUIRES: shell
 //
-// TODO: It isn't clear why this test started failing on the avr bot.
-//       Waiting for help from bot owner to investigate.
-// XFAIL: avr
-//
 // RUN: %clangxx_memprof  %s -o %t
 
 // Regular run.
-// RUN: %run %t 2> %t.out
-// RUN: FileCheck %s --check-prefix=CHECK-GOOD < %t.out
+// RUN: %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-GOOD --dump-input=always
 
 // Good log_path.
 // RUN: rm -f %t.log.*
-// RUN: %env_memprof_opts=log_path=%t.log %run %t 2> %t.out
-// RUN: FileCheck %s --check-prefix=CHECK-GOOD < %t.log.*
+// RUN: %env_memprof_opts=log_path=%t.log %run %t
+// RUN: FileCheck %s --check-prefix=CHECK-GOOD --dump-input=always < %t.log.*
 
 // Invalid log_path.
-// RUN: %env_memprof_opts=log_path=/dev/null/INVALID not %run %t 2> %t.out
-// RUN: FileCheck %s --check-prefix=CHECK-INVALID < %t.out
+// RUN: %env_memprof_opts=log_path=/dev/null/INVALID not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-INVALID --dump-input=always
 
 // Too long log_path.
 // RUN: %env_memprof_opts=log_path=`for((i=0;i<10000;i++)); do echo -n $i; done` \
-// RUN:   not %run %t 2> %t.out
-// RUN: FileCheck %s --check-prefix=CHECK-LONG < %t.out
+// RUN:   not %run %t 2>&1 | FileCheck %s --check-prefix=CHECK-LONG --dump-input=always
 
 // Specifying the log name via the __memprof_profile_filename variable.
 // RUN: %clangxx_memprof  %s -o %t -DPROFILE_NAME_VAR="%t.log2"
 // RUN: rm -f %t.log2.*
-// RUN: %run %t 2> %t.out
-// RUN: FileCheck %s --check-prefix=CHECK-GOOD < %t.log2.*
-
-// Check that the log_path option overrides the log name set via the
-// __memprof_profile_filename variable.
-// RUN: rm -f %t.log.*
-// RUN: %env_memprof_opts=log_path=%t.log %run %t 2> %t.out
-// RUN: FileCheck %s --check-prefix=CHECK-GOOD < %t.log.*
+// RUN: %run %t
+// RUN: FileCheck %s --check-prefix=CHECK-GOOD --dump-input=always < %t.log2.*
 
 #ifdef PROFILE_NAME_VAR
 #define xstr(s) str(s)