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

This series of patches still breaks a Windows bot.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374678 91177308-0d34-0410-b5e6-96231b3b80d8

test/MC/ARM/preserve-comments-arm.s

@@ -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

utils/lit/tests/shtest-shell.py

@@ -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.