[llvm] r361251 - [DebugInfo] Fix tests missed by r362148

[Paul Robinson via llvm-commits]

Author: probinson
Date: Tue May 21 05:48:46 2019
New Revision: 361251

URL: http://llvm.org/viewvc/llvm-project?rev=361251&view=rev
Log:
[DebugInfo] Fix tests missed by r362148

Modified:
    llvm/trunk/test/DebugInfo/X86/asm-macro-line-number.s
    llvm/trunk/test/MC/MachO/gen-dwarf-cpp.s
    llvm/trunk/test/MC/MachO/gen-dwarf-macro-cpp.s

Modified: llvm/trunk/test/DebugInfo/X86/asm-macro-line-number.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/DebugInfo/X86/asm-macro-line-number.s?rev=361251&r1=361250&r2=361251&view=diff
==============================================================================
--- llvm/trunk/test/DebugInfo/X86/asm-macro-line-number.s (original)
+++ llvm/trunk/test/DebugInfo/X86/asm-macro-line-number.s Tue May 21 05:48:46 2019
@@ -18,17 +18,17 @@
 function:
  return 0
 
-# CHECK: .file 2 "reduced.S"
-# CHECK: .loc 2 8 0
+# CHECK: .file 1 "reduced.S"
+# CHECK: .loc 1 8 0
 # CHECK: movl %eax, 0
-# CHECK: .loc 2 8 0
+# CHECK: .loc 1 8 0
 # CHECK: retl
 
 # 42 "reduced.S"
 function2:
  return2 0
 
-# CHECK: .loc 2 43 0
+# CHECK: .loc 1 43 0
 # CHECK: movl %eax, 0
-# CHECK: .loc 2 43 0
+# CHECK: .loc 1 43 0
 # CHECK: retl

Modified: llvm/trunk/test/MC/MachO/gen-dwarf-cpp.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/gen-dwarf-cpp.s?rev=361251&r1=361250&r2=361251&view=diff
==============================================================================
--- llvm/trunk/test/MC/MachO/gen-dwarf-cpp.s (original)
+++ llvm/trunk/test/MC/MachO/gen-dwarf-cpp.s Tue May 21 05:48:46 2019
@@ -14,20 +14,16 @@ L1:	leave
 // rdar://9275556
 
 // We check that the source name "t.s" is picked up
-// CHECK: include_directories[  1] = "{{.*(/|\\\\)}}test{{(/|\\\\)}}MC{{(/|\\\\)}}MachO"
-// CHECK: include_directories[  2] = "inc"
+// CHECK: include_directories[  1] = "inc"
 // CHECK: file_names[  1]:
-// CHECK-NEXT: name: "gen-dwarf-cpp.s"
-// CHECK-NEXT: dir_index: 1
-// CHECK: file_names[  2]:
-// CHECK-NEXT: name: "t.s"
+/ CHECK-NEXT: name: "t.s"
 // CHECK-NEXT: dir_index: 0
-// CHECK: file_names[  3]:
+// CHECK: file_names[  2]:
 // CHECK-NEXT: name: "g.s"
-// CHECK-NEXT: dir_index: 2
+// CHECK-NEXT: dir_index: 1
 // CHECK-NOT: file_names
 
 // We check that the source line number 100 is picked up before the "movl"
 // CHECK: Address            Line   Column File   ISA Discriminator Flags
 // CHECK: ------------------ ------ ------ ------ --- ------------- -------------
-// CHECK: 0x0000000000000000    102      0      2   0             0  is_stmt
+// CHECK: 0x0000000000000000    102      0      1   0             0  is_stmt

Modified: llvm/trunk/test/MC/MachO/gen-dwarf-macro-cpp.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/MachO/gen-dwarf-macro-cpp.s?rev=361251&r1=361250&r2=361251&view=diff
==============================================================================
--- llvm/trunk/test/MC/MachO/gen-dwarf-macro-cpp.s (original)
+++ llvm/trunk/test/MC/MachO/gen-dwarf-macro-cpp.s Tue May 21 05:48:46 2019
@@ -12,8 +12,5 @@
 
 // We check that the source name "foo.S" is picked up
 // CHECK: file_names[  1]:
-// CHECK-NEXT: name: "gen-dwarf-macro-cpp.s"
-// CHECK-NEXT: dir_index: 1
-// CHECK: file_names[  2]:
 // CHECK-NEXT: name: "foo.S"
 // CHECK-NEXT: dir_index: 0