Make llvm-nm test consistent with other tests

llvm-svn: 260464

diff --git a/llvm/test/tools/llvm-nm/X86/radix/Inputs/radix.asm b/llvm/test/tools/llvm-nm/X86/radix.s
similarity index 51%
rename from llvm/test/tools/llvm-nm/X86/radix/Inputs/radix.asm
rename to llvm/test/tools/llvm-nm/X86/radix.s
index fba3f99..e6199e8 100644 (file)
--- a/llvm/test/tools/llvm-nm/X86/radix/Inputs/radix.asm
+++ b/llvm/test/tools/llvm-nm/X86/radix.s
@@ -1,3 +1,9 @@
+//#check radix formats of llvm-nm
+//RUN: llvm-mc  %s -filetype=obj -triple=x86_64-pc-linux -o %t.o
+//RUN: llvm-nm -radix=d %t.o | FileCheck  %s
+//RUN: llvm-nm -radix=o %t.o | FileCheck --check-prefix="OCTAL" %s
+//RUN: llvm-nm -t=x %t.o | FileCheck --check-prefix="HEX" %s
+
        .text
        .file   "1.c"
        .type   i0,@object              # @i0
@@ -180,3 +186,81 @@ i24:
 
        .ident  "clang version 3.6.0 (tags/RELEASE_360/final)"
        .section        ".note.GNU-stack","",@progbits
+
+//CHECK:    0000000000000000 B i0
+//CHECK:    0000000000000000 D i1
+//CHECK:    0000000000000036 D i10
+//CHECK:    0000000000000040 D i11
+//CHECK:    0000000000000044 D i12
+//CHECK:    0000000000000048 D i13
+//CHECK:    0000000000000052 D i14
+//CHECK:    0000000000000056 D i15
+//CHECK:    0000000000000060 D i16
+//CHECK:    0000000000000064 D i17
+//CHECK:    0000000000000068 D i18
+//CHECK:    0000000000000072 D i19
+//CHECK:    0000000000000004 D i2
+//CHECK:    0000000000000076 D i20
+//CHECK:    0000000000000080 D i21
+//CHECK:    0000000000000084 D i22
+//CHECK:    0000000000000088 D i23
+//CHECK:    0000000000000092 D i24
+//CHECK:    0000000000000008 D i3
+//CHECK:    0000000000000012 D i4
+//CHECK:    0000000000000016 D i5
+//CHECK:    0000000000000020 D i6
+//CHECK:    0000000000000024 D i7
+//CHECK:    0000000000000028 D i8
+//CHECK:    0000000000000032 D i9
+
+//OCTAL:    0000000000000000 B i0
+//OCTAL:    0000000000000000 D i1
+//OCTAL:    0000000000000044 D i10
+//OCTAL:    0000000000000050 D i11
+//OCTAL:    0000000000000054 D i12
+//OCTAL:    0000000000000060 D i13
+//OCTAL:    0000000000000064 D i14
+//OCTAL:    0000000000000070 D i15
+//OCTAL:    0000000000000074 D i16
+//OCTAL:    0000000000000100 D i17
+//OCTAL:    0000000000000104 D i18
+//OCTAL:    0000000000000110 D i19
+//OCTAL:    0000000000000004 D i2
+//OCTAL:    0000000000000114 D i20
+//OCTAL:    0000000000000120 D i21
+//OCTAL:    0000000000000124 D i22
+//OCTAL:    0000000000000130 D i23
+//OCTAL:    0000000000000134 D i24
+//OCTAL:    0000000000000010 D i3
+//OCTAL:    0000000000000014 D i4
+//OCTAL:    0000000000000020 D i5
+//OCTAL:    0000000000000024 D i6
+//OCTAL:    0000000000000030 D i7
+//OCTAL:    0000000000000034 D i8
+//OCTAL:    0000000000000040 D i9
+
+//HEX:    0000000000000000 B i0
+//HEX:    0000000000000000 D i1
+//HEX:    0000000000000024 D i10
+//HEX:    0000000000000028 D i11
+//HEX:    000000000000002c D i12
+//HEX:    0000000000000030 D i13
+//HEX:    0000000000000034 D i14
+//HEX:    0000000000000038 D i15
+//HEX:    000000000000003c D i16
+//HEX:    0000000000000040 D i17
+//HEX:    0000000000000044 D i18
+//HEX:    0000000000000048 D i19
+//HEX:    0000000000000004 D i2
+//HEX:    000000000000004c D i20
+//HEX:    0000000000000050 D i21
+//HEX:    0000000000000054 D i22
+//HEX:    0000000000000058 D i23
+//HEX:    000000000000005c D i24
+//HEX:    0000000000000008 D i3
+//HEX:    000000000000000c D i4
+//HEX:    0000000000000010 D i5
+//HEX:    0000000000000014 D i6
+//HEX:    0000000000000018 D i7
+//HEX:    000000000000001c D i8
+//HEX:    0000000000000020 D i9

diff --git a/llvm/test/tools/llvm-nm/X86/radix/lit.local.cfg b/llvm/test/tools/llvm-nm/X86/radix/lit.local.cfg
deleted file mode 100644 (file)
index c8625f4..0000000
--- a/llvm/test/tools/llvm-nm/X86/radix/lit.local.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-if not 'X86' in config.root.targets:
-    config.unsupported = True

diff --git a/llvm/test/tools/llvm-nm/X86/radix/radix.test b/llvm/test/tools/llvm-nm/X86/radix/radix.test
deleted file mode 100644 (file)
index c6e35bc..0000000
--- a/llvm/test/tools/llvm-nm/X86/radix/radix.test
+++ /dev/null
@@ -1,83 +0,0 @@
-#check radix formats of llvm-nm
-RUN: llvm-mc  -filetype=obj -triple=x86_64-pc-linux %p/Inputs/radix.asm -o %t.o
-RUN: llvm-nm -radix=d %t.o | FileCheck  %s
-RUN: llvm-nm -radix=o %t.o | FileCheck --check-prefix="OCTAL" %s
-RUN: llvm-nm -t=x %t.o | FileCheck --check-prefix="HEX" %s
-
-CHECK:    0000000000000000 B i0
-CHECK:    0000000000000000 D i1
-CHECK:    0000000000000036 D i10
-CHECK:    0000000000000040 D i11
-CHECK:    0000000000000044 D i12
-CHECK:    0000000000000048 D i13
-CHECK:    0000000000000052 D i14
-CHECK:    0000000000000056 D i15
-CHECK:    0000000000000060 D i16
-CHECK:    0000000000000064 D i17
-CHECK:    0000000000000068 D i18
-CHECK:    0000000000000072 D i19
-CHECK:    0000000000000004 D i2
-CHECK:    0000000000000076 D i20
-CHECK:    0000000000000080 D i21
-CHECK:    0000000000000084 D i22
-CHECK:    0000000000000088 D i23
-CHECK:    0000000000000092 D i24
-CHECK:    0000000000000008 D i3
-CHECK:    0000000000000012 D i4
-CHECK:    0000000000000016 D i5
-CHECK:    0000000000000020 D i6
-CHECK:    0000000000000024 D i7
-CHECK:    0000000000000028 D i8
-CHECK:    0000000000000032 D i9
-
-OCTAL:    0000000000000000 B i0
-OCTAL:    0000000000000000 D i1
-OCTAL:    0000000000000044 D i10
-OCTAL:    0000000000000050 D i11
-OCTAL:    0000000000000054 D i12
-OCTAL:    0000000000000060 D i13
-OCTAL:    0000000000000064 D i14
-OCTAL:    0000000000000070 D i15
-OCTAL:    0000000000000074 D i16
-OCTAL:    0000000000000100 D i17
-OCTAL:    0000000000000104 D i18
-OCTAL:    0000000000000110 D i19
-OCTAL:    0000000000000004 D i2
-OCTAL:    0000000000000114 D i20
-OCTAL:    0000000000000120 D i21
-OCTAL:    0000000000000124 D i22
-OCTAL:    0000000000000130 D i23
-OCTAL:    0000000000000134 D i24
-OCTAL:    0000000000000010 D i3
-OCTAL:    0000000000000014 D i4
-OCTAL:    0000000000000020 D i5
-OCTAL:    0000000000000024 D i6
-OCTAL:    0000000000000030 D i7
-OCTAL:    0000000000000034 D i8
-OCTAL:    0000000000000040 D i9
-
-HEX:    0000000000000000 B i0
-HEX:    0000000000000000 D i1
-HEX:    0000000000000024 D i10
-HEX:    0000000000000028 D i11
-HEX:    000000000000002c D i12
-HEX:    0000000000000030 D i13
-HEX:    0000000000000034 D i14
-HEX:    0000000000000038 D i15
-HEX:    000000000000003c D i16
-HEX:    0000000000000040 D i17
-HEX:    0000000000000044 D i18
-HEX:    0000000000000048 D i19
-HEX:    0000000000000004 D i2
-HEX:    000000000000004c D i20
-HEX:    0000000000000050 D i21
-HEX:    0000000000000054 D i22
-HEX:    0000000000000058 D i23
-HEX:    000000000000005c D i24
-HEX:    0000000000000008 D i3
-HEX:    000000000000000c D i4
-HEX:    0000000000000010 D i5
-HEX:    0000000000000014 D i6
-HEX:    0000000000000018 D i7
-HEX:    000000000000001c D i8
-HEX:    0000000000000020 D i9