projects / platform / upstream / llvm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c22d80)
[dsymutil][test] Check the updated dSYM instead of companion file.
authorJonas Devlieghere <jonas@devlieghere.com>
Wed, 7 Feb 2018 15:18:21 +0000 (15:18 +0000)
committerJonas Devlieghere <jonas@devlieghere.com>
Wed, 7 Feb 2018 15:18:21 +0000 (15:18 +0000)
This patch has llvm-dwarfdump check the whole dSYM, rather than the
hard-coded path to the Mach-O companion file. This might be what's
causing the Windows bot to fail.

llvm-svn: 324483

llvm/test/tools/dsymutil/X86/basic-linking-x86.test patch | blob | history
llvm/test/tools/dsymutil/X86/update-one-CU.test patch | blob | history

diff --git a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test
index 4e6c6f6..0c73dfa 100644 (file)
--- a/llvm/test/tools/dsymutil/X86/basic-linking-x86.test
+++ b/llvm/test/tools/dsymutil/X86/basic-linking-x86.test
@@ -13,13 +13,13 @@ RUN: rm -rf %t.dir
 RUN: mkdir -p %t.dir
 RUN: cat %p/../Inputs/basic.macho.x86_64 > %t.dir/basic
 RUN: llvm-dsymutil -oso-prepend-path=%p/.. %t.dir/basic
-RUN: llvm-dwarfdump -a %t.dir/basic.dSYM/Contents/Resources/DWARF/basic | FileCheck %s
+RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %s
 RUN: llvm-dsymutil --update %t.dir/basic.dSYM
-RUN: llvm-dwarfdump -a %t.dir/basic.dSYM/Contents/Resources/DWARF/basic | FileCheck %s
+RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %s
 RUN: llvm-dsymutil -u %t.dir/basic.dSYM
-RUN: llvm-dwarfdump -a %t.dir/basic.dSYM/Contents/Resources/DWARF/basic | FileCheck %s
+RUN: llvm-dwarfdump -a %t.dir/basic.dSYM | FileCheck %s
 RUN: llvm-dsymutil --update %t.dir/basic.dSYM -o %t.dir/updated.dSYM
-RUN: llvm-dwarfdump -a %t.dir/updated.dSYM/Contents/Resources/DWARF/basic | FileCheck %s
+RUN: llvm-dwarfdump -a %t.dir/updated.dSYM | FileCheck %s
 RUN: llvm-dsymutil -f -u %t2 -o %t3
 RUN: llvm-dwarfdump -a %t3 | FileCheck %s
 
diff --git a/llvm/test/tools/dsymutil/X86/update-one-CU.test b/llvm/test/tools/dsymutil/X86/update-one-CU.test
index aec9b2f..5e55e15 100644 (file)
--- a/llvm/test/tools/dsymutil/X86/update-one-CU.test
+++ b/llvm/test/tools/dsymutil/X86/update-one-CU.test
@@ -1,6 +1,6 @@
 RUN: llvm-dsymutil -oso-prepend-path=%p/.. %p/../Inputs/objc.macho.x86_64 -o %t.dSYM
 RUN: llvm-dsymutil -update %t.dSYM
-RUN: llvm-dwarfdump -apple-types -apple-objc %t.dSYM/Contents/Resources/DWARF/objc.macho.x86_64 | FileCheck %s
+RUN: llvm-dwarfdump -apple-types -apple-objc %t.dSYM | FileCheck %s
 
 CHECK: .apple_types contents:
 CHECK: Hash 0x2b5e6 [
Domain: System / Toolchain;