[llvm] r324483 - [dsymutil][test] Check the updated dSYM instead of companion file.

[Jonas Devlieghere via llvm-commits]

Author: jdevlieghere
Date: Wed Feb  7 07:18:21 2018
New Revision: 324483

URL: http://llvm.org/viewvc/llvm-project?rev=324483&view=rev
Log:
[dsymutil][test] Check the updated dSYM instead of companion file.

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.

Modified:
    llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test
    llvm/trunk/test/tools/dsymutil/X86/update-one-CU.test

Modified: llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test?rev=324483&r1=324482&r2=324483&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test (original)
+++ llvm/trunk/test/tools/dsymutil/X86/basic-linking-x86.test Wed Feb  7 07:18:21 2018
@@ -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
 

Modified: llvm/trunk/test/tools/dsymutil/X86/update-one-CU.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/dsymutil/X86/update-one-CU.test?rev=324483&r1=324482&r2=324483&view=diff
==============================================================================
--- llvm/trunk/test/tools/dsymutil/X86/update-one-CU.test (original)
+++ llvm/trunk/test/tools/dsymutil/X86/update-one-CU.test Wed Feb  7 07:18:21 2018
@@ -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 [