Index: llvm/trunk/test/DllTool/coff-decorated.def
===================================================================
--- llvm/trunk/test/DllTool/coff-decorated.def
+++ llvm/trunk/test/DllTool/coff-decorated.def
@@ -1,26 +0,0 @@
-; RUN: llvm-dlltool -k -m i386 --input-def %s --output-lib %t.a
-; RUN: llvm-readobj %t.a | FileCheck %s
-; RUN: llvm-nm %t.a | FileCheck %s -check-prefix=CHECK-NM
-
-LIBRARY test.dll
-EXPORTS
-CdeclFunction
-StdcallFunction@4
-@FastcallFunction@4
-StdcallAlias@4=StdcallFunction@4
-??_7exception@@6B@
-
-; CHECK: Name type: noprefix
-; CHECK: Symbol: __imp__CdeclFunction
-; CHECK: Symbol: _CdeclFunction
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp__StdcallFunction@4
-; CHECK: Symbol: _StdcallFunction@4
-; CHECK: Name type: undecorate
-; CHECK: Symbol: __imp_@FastcallFunction@4
-; CHECK: Symbol: @FastcallFunction@4
-; CHECK: Name type: name
-; CHECK: Symbol: __imp_??_7exception@@6B@
-; CHECK: Symbol: ??_7exception@@6B@
-; CHECK-NM: w _StdcallAlias@4
-; CHECK-NM: U _StdcallFunction@4
Index: llvm/trunk/test/DllTool/coff-exports.def
===================================================================
--- llvm/trunk/test/DllTool/coff-exports.def
+++ llvm/trunk/test/DllTool/coff-exports.def
@@ -1,15 +0,0 @@
-; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a
-; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
-; RUN: llvm-dlltool -m arm64 --input-def %s --output-lib %t.a
-; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
-
-LIBRARY test.dll
-EXPORTS
-TestFunction
-
-; CHECK: File: test.dll
-; CHECK: Format: COFF-import-file
-; CHECK: Type: code
-; CHECK: Name type: name
-; CHECK: Symbol: __imp_TestFunction
-; CHECK: Symbol: TestFunction
Index: llvm/trunk/test/DllTool/coff-weak-exports.def
===================================================================
--- llvm/trunk/test/DllTool/coff-weak-exports.def
+++ llvm/trunk/test/DllTool/coff-weak-exports.def
@@ -1,11 +0,0 @@
-; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a
-; RUN: llvm-nm %t.a | FileCheck %s
-
-LIBRARY test.dll
-EXPORTS
-TestFunction==AltTestFunction
-
-; CHECK:      U AltTestFunction
-; CHECK-NEXT: w TestFunction
-; CHECK:      U __imp_AltTestFunction
-; CHECK-NEXT: w __imp_TestFunction
Index: llvm/trunk/test/DllTool/lit.local.cfg
===================================================================
--- llvm/trunk/test/DllTool/lit.local.cfg
+++ llvm/trunk/test/DllTool/lit.local.cfg
@@ -1 +0,0 @@
-config.suffixes = ['.def']
Index: llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
===================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
+++ llvm/trunk/test/tools/llvm-dlltool/coff-decorated.def
@@ -0,0 +1,26 @@
+; RUN: llvm-dlltool -k -m i386 --input-def %s --output-lib %t.a
+; RUN: llvm-readobj %t.a | FileCheck %s
+; RUN: llvm-nm %t.a | FileCheck %s -check-prefix=CHECK-NM
+
+LIBRARY test.dll
+EXPORTS
+CdeclFunction
+StdcallFunction@4
+@FastcallFunction@4
+StdcallAlias@4=StdcallFunction@4
+??_7exception@@6B@
+
+; CHECK: Name type: noprefix
+; CHECK: Symbol: __imp__CdeclFunction
+; CHECK: Symbol: _CdeclFunction
+; CHECK: Name type: undecorate
+; CHECK: Symbol: __imp__StdcallFunction@4
+; CHECK: Symbol: _StdcallFunction@4
+; CHECK: Name type: undecorate
+; CHECK: Symbol: __imp_@FastcallFunction@4
+; CHECK: Symbol: @FastcallFunction@4
+; CHECK: Name type: name
+; CHECK: Symbol: __imp_??_7exception@@6B@
+; CHECK: Symbol: ??_7exception@@6B@
+; CHECK-NM: w _StdcallAlias@4
+; CHECK-NM: U _StdcallFunction@4
Index: llvm/trunk/test/tools/llvm-dlltool/coff-exports.def
===================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-exports.def
+++ llvm/trunk/test/tools/llvm-dlltool/coff-exports.def
@@ -0,0 +1,15 @@
+; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a
+; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
+; RUN: llvm-dlltool -m arm64 --input-def %s --output-lib %t.a
+; RUN: llvm-readobj -coff-exports %t.a | FileCheck %s
+
+LIBRARY test.dll
+EXPORTS
+TestFunction
+
+; CHECK: File: test.dll
+; CHECK: Format: COFF-import-file
+; CHECK: Type: code
+; CHECK: Name type: name
+; CHECK: Symbol: __imp_TestFunction
+; CHECK: Symbol: TestFunction
Index: llvm/trunk/test/tools/llvm-dlltool/coff-weak-exports.def
===================================================================
--- llvm/trunk/test/tools/llvm-dlltool/coff-weak-exports.def
+++ llvm/trunk/test/tools/llvm-dlltool/coff-weak-exports.def
@@ -0,0 +1,11 @@
+; RUN: llvm-dlltool -m i386:x86-64 --input-def %s --output-lib %t.a
+; RUN: llvm-nm %t.a | FileCheck %s
+
+LIBRARY test.dll
+EXPORTS
+TestFunction==AltTestFunction
+
+; CHECK:      U AltTestFunction
+; CHECK-NEXT: w TestFunction
+; CHECK:      U __imp_AltTestFunction
+; CHECK-NEXT: w __imp_TestFunction
Index: llvm/trunk/test/tools/llvm-dlltool/lit.local.cfg
===================================================================
--- llvm/trunk/test/tools/llvm-dlltool/lit.local.cfg
+++ llvm/trunk/test/tools/llvm-dlltool/lit.local.cfg
@@ -0,0 +1 @@
+config.suffixes = ['.def']