[llvm] r374678 - Revert r374653: "[lit] Fix a few oversights in r374651 that broke some bots"

[Joel E. Denny via llvm-commits]

Author: jdenny
Date: Sat Oct 12 11:51:34 2019
New Revision: 374678

URL: http://llvm.org/viewvc/llvm-project?rev=374678&view=rev
Log:
Revert r374653: "[lit] Fix a few oversights in r374651 that broke some bots"

This series of patches still breaks a Windows bot.

Modified:
    llvm/trunk/test/MC/ARM/preserve-comments-arm.s
    llvm/trunk/utils/lit/tests/shtest-shell.py

Modified: llvm/trunk/test/MC/ARM/preserve-comments-arm.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/preserve-comments-arm.s?rev=374678&r1=374677&r2=374678&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/preserve-comments-arm.s (original)
+++ llvm/trunk/test/MC/ARM/preserve-comments-arm.s Sat Oct 12 11:51:34 2019
@@ -1,6 +1,6 @@
 	@RUN: llvm-mc -preserve-comments -n -triple arm-eabi < %s > %t
 	@RUN: sed 's/#[C]omment/@Comment/g' %s > %t2
-	@RUN: diff --strip-trailing-cr %t %t2
+	@RUN: diff %t %t2
 	.text
 
 	mov	r0, r0

Modified: llvm/trunk/utils/lit/tests/shtest-shell.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/tests/shtest-shell.py?rev=374678&r1=374677&r2=374678&view=diff
==============================================================================
--- llvm/trunk/utils/lit/tests/shtest-shell.py (original)
+++ llvm/trunk/utils/lit/tests/shtest-shell.py Sat Oct 12 11:51:34 2019
@@ -4,7 +4,7 @@
 # FIXME: Temporarily dump test output so we can debug failing tests on
 # buildbots.
 # RUN: cat %t.out
-# RUN: FileCheck --input-file %t.out %s
+# RUN: FileCheck --dump-input=fail --color -vv --input-file %t.out %s
 #
 # END.