Make pdbdump-objfilename test work again

- The test had extension .yaml, which lit doesn't execute in this
  directory. Rename to .test to make it run, and move the yaml bits
  into a dedicated file, like with all other tests in this dir.

- llvm-pdbdump got renamed to llvm-pdbutil long ago, update test.

- -dbi-module-info got renamed in r305032, update test for this too.

llvm-svn: 365514

3 files changed, 13 insertions, 14 deletions

diff --git a/llvm/test/DebugInfo/PDB/Inputs/objfilename.yaml b/llvm/test/DebugInfo/PDB/Inputs/objfilename.yaml
new file mode 100644
index 00000000000..81176ddb367
--- /dev/null
+++ b/llvm/test/DebugInfo/PDB/Inputs/objfilename.yaml
@@ -0,0 +1,6 @@
+---
+DbiStream:
+  Modules:
+    - Module:          'C:\src\test.obj'
+      ObjFile:         'C:\src\test.obj'
+...
diff --git a/llvm/test/DebugInfo/PDB/pdbdump-objfilename.test b/llvm/test/DebugInfo/PDB/pdbdump-objfilename.test
new file mode 100644
index 00000000000..a97233f72da
--- /dev/null
+++ b/llvm/test/DebugInfo/PDB/pdbdump-objfilename.test
@@ -0,0 +1,7 @@
+# RUN: llvm-pdbutil yaml2pdb -pdb=%t %p/Inputs/objfilename.yaml
+# RUN: llvm-pdbutil pdb2yaml -modules %t | FileCheck %s
+
+CHECK: DbiStream:
+CHECK: Modules:
+CHECK-NEXT: - Module:{{ *}}'C:\src\test.obj'
+CHECK-NEXT: ObjFile:{{ *}}'C:\src\test.obj'
diff --git a/llvm/test/DebugInfo/PDB/pdbdump-objfilename.yaml b/llvm/test/DebugInfo/PDB/pdbdump-objfilename.yaml
deleted file mode 100644
index 6ddb4775f29..00000000000
--- a/llvm/test/DebugInfo/PDB/pdbdump-objfilename.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-# RUN: llvm-pdbdump yaml2pdb -pdb=%t %s
-# RUN: llvm-pdbdump pdb2yaml -dbi-module-info %t \
-# RUN:     | FileCheck %s
-#
-# CHECK: DbiStream:
-# CHECK: Modules:
-# CHECK-NEXT: - Module:{{ *}}'C:\src\test.obj'
-# CHECK-NEXT: ObjFile:{{ *}}'C:\src\test.obj'
----
-DbiStream:
-  Modules:
-    - Module:          'C:\src\test.obj'
-      ObjFile:         'C:\src\test.obj'
-...