[llvm] 1794158 - [MC][test] Fix non-portable GNU diff option

Hubert Tong via llvm-commits llvm-commits at lists.llvm.org
Thu Jan 16 08:29:30 PST 2020


Author: Hubert Tong
Date: 2020-01-16T11:29:24-05:00
New Revision: 1794158f90f904ad2d07c1fcae5c3114a4f23d68

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

LOG: [MC][test] Fix non-portable GNU diff option

Summary: This patch replaces the non-portable GNU diff option `--strip-trailing-cr` with the POSIX `-b` option in two test files.

Reviewers: daltenty, jasonliu

Reviewed By: daltenty

Subscribers: llvm-commits

Tags: #llvm

Differential Revision: https://reviews.llvm.org/D72745

Added: 
    

Modified: 
    llvm/test/MC/ARM/preserve-comments-arm.s
    llvm/test/MC/AsmParser/preserve-comments.s

Removed: 
    


################################################################################
diff  --git a/llvm/test/MC/ARM/preserve-comments-arm.s b/llvm/test/MC/ARM/preserve-comments-arm.s
index fe8f5081bb11..830e512ab5ee 100644
--- a/llvm/test/MC/ARM/preserve-comments-arm.s
+++ b/llvm/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  -b %t %t2
 	.text
 
 	mov	r0, r0

diff  --git a/llvm/test/MC/AsmParser/preserve-comments.s b/llvm/test/MC/AsmParser/preserve-comments.s
index 90a71ea79842..27c5b2e07071 100644
--- a/llvm/test/MC/AsmParser/preserve-comments.s
+++ b/llvm/test/MC/AsmParser/preserve-comments.s
@@ -1,5 +1,5 @@
 	#RUN: llvm-mc -preserve-comments -n -triple i386-linux-gnu < %s > %t
-	#RUN: 
diff  --strip-trailing-cr %s %t
+	#RUN: 
diff  -b %s %t
 	.text
 
 foo:	#Comment here


        


More information about the llvm-commits mailing list