[llvm] f0f3d1b - Revert "Fix Windows llvm-objdump tests"

[Renato Golin via llvm-commits]

Author: Renato Golin
Date: 2020-10-16T21:49:47+01:00
New Revision: f0f3d1b1817a48daa0680324bec3c6d34e590d4a

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

LOG: Revert "Fix Windows llvm-objdump tests"

It had already been fixed in a different way.

Added: 
    

Modified: 
    llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test
    llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test

Removed: 
    


################################################################################
diff  --git a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test
index aa74a36a3f31..a32d1b704736 100644
--- a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test
+++ b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test
@@ -7,4 +7,4 @@
 ; RUN: sed -e "s,SRC_COMPDIR,/Inputs,g" %p/Inputs/source-interleave.ll > %t.ll
 ; RUN: llc -o %t.o -filetype=obj -mtriple=x86_64-pc-linux %t.ll
 ; RUN: llvm-objdump --prefix 'myprefix/\' --source %t.o 2>&1 | FileCheck %s -DFILE=%t.o -DPREFIX='myprefix/\'
-; CHECK: warning: '[[FILE]]': failed to find source {{.*}}source-interleave-x86_64.c
+; CHECK: warning: '[[FILE]]': failed to find source [[PREFIX]]/Inputs/source-interleave-x86_64.c

diff  --git a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test
index c34cb39f7dd0..b384c49b350e 100644
--- a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test
+++ b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test
@@ -7,7 +7,7 @@
 ; RUN: llc -o %t-relative-path.o -filetype=obj -mtriple=x86_64-pc-linux %t-relative-path.ll
 ; RUN: llvm-objdump --prefix myprefix --source %t-relative-path.o 2>&1 | \
 ; RUN:   FileCheck %s --check-prefix=CHECK-BROKEN-PREFIX -DFILE=%t-relative-path.o -DPREFIX=.
-; CHECK-BROKEN-PREFIX: warning: '[[FILE]]': failed to find source {{.*}}source-interleave-x86_64.c
+; CHECK-BROKEN-PREFIX: warning: '[[FILE]]': failed to find source [[PREFIX]]/Inputs/source-interleave-x86_64.c
 
 ;; Test invalid source interleave fixed by adding the correct prefix.