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 --- 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 @@ -1,10 +1,11 @@ ;; Test --prefix option platform specific behavior. ; UNSUPPORTED: system-windows -;; Test removal of trailing separators (only '/'). +;; Test removal of trailing separators (only '/' on non-Windows systems). ;; The prefix 'myprefix/\' is not changed. ; 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 [[PREFIX]]/Inputs/source-interleave-x86_64.c + 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-windows.test copy from llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test copy to llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-windows.test --- a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-non-windows.test +++ b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix-windows.test @@ -1,10 +1,11 @@ ;; Test --prefix option platform specific behavior. -; UNSUPPORTED: system-windows +; REQUIRES: system-windows -;; Test removal of trailing separators (only '/'). -;; The prefix 'myprefix/\' is not changed. +;; Test removal of trailing separators (both '/' and '\' on Windows systems). +;; The prefix 'myprefix/\' is changed to 'myprefix'. ; 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 [[PREFIX]]/Inputs/source-interleave-x86_64.c +; RUN: llvm-objdump --prefix 'myprefix/\' --source %t.o 2>&1 | FileCheck %s -DFILE=%t.o -DPREFIX='myprefix' +; 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 --- a/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test +++ b/llvm/test/tools/llvm-objdump/X86/source-interleave-prefix.test @@ -1,13 +1,19 @@ ;; Test --prefix option. -;; UNSUPPORTED: system-windows + +;; Separators change from platform to platform. In POSIX the full path for the +;; directory './Inputs' appended with the file 'source-interleave-x86_64.c' is +;; './Inputs/source-interleave-x86_64.c'. For Windows it is +;; './Inputs\source-interleave-x86_64.c'. Platform specific tests are needed +;; since '\' may or may not be a separator. ;; Test prefix option ignored for relative paths. +;; For the test below it is possible to accept both '/' and '\' as a separator. ; RUN: sed -e "s,SRC_COMPDIR,./Inputs,g" %p/Inputs/source-interleave.ll > %t-relative-path.ll ; 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 [[PREFIX]]/Inputs/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. @@ -34,3 +40,4 @@ ; RUN: llvm-objdump --prefix myprefix// --source %t-missing-prefix.o 2>&1 | \ ; RUN: FileCheck %s --check-prefix=CHECK-BROKEN-PREFIX -DFILE=%t-missing-prefix.o -DPREFIX=myprefix +