summaryrefslogtreecommitdiffstats
path: root/llvm/test/tools
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/test/tools')
-rw-r--r--llvm/test/tools/llvm-cvtres/Inputs/combined.obj.coffbin4040 -> 0 bytes
-rw-r--r--llvm/test/tools/llvm-cvtres/Inputs/languages.rc36
-rw-r--r--llvm/test/tools/llvm-cvtres/Inputs/languages.resbin452 -> 0 bytes
-rw-r--r--llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.armbin3472 -> 0 bytes
-rw-r--r--llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.x64bin3472 -> 0 bytes
-rw-r--r--llvm/test/tools/llvm-cvtres/basic.test4
-rw-r--r--llvm/test/tools/llvm-cvtres/combined.test313
-rw-r--r--llvm/test/tools/llvm-cvtres/help.test13
-rw-r--r--llvm/test/tools/llvm-cvtres/machine.test59
-rw-r--r--llvm/test/tools/llvm-cvtres/object.test225
-rw-r--r--llvm/test/tools/llvm-cvtres/parse.test2
-rw-r--r--llvm/test/tools/llvm-readobj/resources.test230
12 files changed, 201 insertions, 681 deletions
diff --git a/llvm/test/tools/llvm-cvtres/Inputs/combined.obj.coff b/llvm/test/tools/llvm-cvtres/Inputs/combined.obj.coff
deleted file mode 100644
index bbb670b258e..00000000000
--- a/llvm/test/tools/llvm-cvtres/Inputs/combined.obj.coff
+++ /dev/null
Binary files differ
diff --git a/llvm/test/tools/llvm-cvtres/Inputs/languages.rc b/llvm/test/tools/llvm-cvtres/Inputs/languages.rc
deleted file mode 100644
index 081b3a77beb..00000000000
--- a/llvm/test/tools/llvm-cvtres/Inputs/languages.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#include "windows.h"
-
-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
-randomdat RCDATA
-{
- "this is a random bit of data that means nothing\0",
- 0x23a9,
- 0x140e,
- 194292,
-}
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-randomdat RCDATA
-{
- "zhe4 shi4 yi1ge4 sui2ji1 de shu4ju4, zhe4 yi4wei4zhe shen2me\0",
- 0x23a9,
- 0x140e,
- 194292,
-}
-
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN_LUXEMBOURG
-randomdat RCDATA
-{
- "Dies ist ein zufälliges Bit von Daten, die nichts bedeutet\0",
- 0x23a9,
- 0x140e,
- 194292,
-}
-
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-myaccelerators ACCELERATORS
-{
- "^C", 999, VIRTKEY, ALT
- "D", 1100, VIRTKEY, CONTROL, SHIFT
- "^R", 444, ASCII, NOINVERT
-}
diff --git a/llvm/test/tools/llvm-cvtres/Inputs/languages.res b/llvm/test/tools/llvm-cvtres/Inputs/languages.res
deleted file mode 100644
index 31da6166d7f..00000000000
--- a/llvm/test/tools/llvm-cvtres/Inputs/languages.res
+++ /dev/null
Binary files differ
diff --git a/llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.arm b/llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.arm
deleted file mode 100644
index ca2f9a4fd04..00000000000
--- a/llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.arm
+++ /dev/null
Binary files differ
diff --git a/llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.x64 b/llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.x64
deleted file mode 100644
index 4620f97f0af..00000000000
--- a/llvm/test/tools/llvm-cvtres/Inputs/test_resource.obj.coff.x64
+++ /dev/null
Binary files differ
diff --git a/llvm/test/tools/llvm-cvtres/basic.test b/llvm/test/tools/llvm-cvtres/basic.test
new file mode 100644
index 00000000000..fcebef22f65
--- /dev/null
+++ b/llvm/test/tools/llvm-cvtres/basic.test
@@ -0,0 +1,4 @@
+; RUN: llvm-cvtres /h > %t
+; RUN: FileCheck -input-file=%t %s -check-prefix=HELP_TEST
+
+; HELP_TEST: OVERVIEW: Resource Converter
diff --git a/llvm/test/tools/llvm-cvtres/combined.test b/llvm/test/tools/llvm-cvtres/combined.test
deleted file mode 100644
index bb3b4dbc736..00000000000
--- a/llvm/test/tools/llvm-cvtres/combined.test
+++ /dev/null
@@ -1,313 +0,0 @@
-// Check that cvtres properly handles merging multiple .res files.
-// The inputs were generated with the following commands, using the original Windows
-// rc.exe:
-// > rc /fo test_resource.res /nologo test_resource.rc
-// > rc /fo languages.res /nologo languages.rc
-// The object file we are comparing against was generated with this command using
-// the original Windows cvtres.exe.
-// > cvtres /machine:X86 /readonly /nologo /out:combined.obj.coff \
-// languages.res test_resource.res
-
-RUN: llvm-cvtres /out:%t %p/Inputs/languages.res %p/Inputs/test_resource.res
-RUN: llvm-readobj -coff-resources -section-data %t | FileCheck %s
-
-CHECK: Resources [
-CHECK-NEXT: Total Number of Resources: 12
-CHECK-DAG: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 5
-CHECK-NEXT: Type: STRINGARRAY [
-CHECK-NEXT: Table Offset: 0x40
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: MYRESOURCE [
-CHECK-NEXT: Table Offset: 0xE8
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1D8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_BITMAP (ID 2) [
-CHECK-NEXT: Table Offset: 0x58
-CHECK-NEXT: Number of String Entries: 2
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: CURSOR [
-CHECK-NEXT: Table Offset: 0x100
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1E8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Name: OKAY [
-CHECK-NEXT: Table Offset: 0x118
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1F8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_MENU (ID 4) [
-CHECK-NEXT: Table Offset: 0x78
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Name: "EAT" [
-CHECK-NEXT: Table Offset: 0x130
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 3081) [
-CHECK-NEXT: Entry Offset: 0x208
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Name: (ID 14432) [
-CHECK-NEXT: Table Offset: 0x148
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 2052) [
-CHECK-NEXT: Entry Offset: 0x218
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_DIALOG (ID 5) [
-CHECK-NEXT: Table Offset: 0x98
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: TESTDIALOG [
-CHECK-NEXT: Table Offset: 0x160
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x228
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_ACCELERATOR (ID 9) [
-CHECK-NEXT: Table Offset: 0xB0
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Name: MYACCELERATORS [
-CHECK-NEXT: Table Offset: 0x178
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 2
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x238
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: Language: (ID 2052) [
-CHECK-NEXT: Entry Offset: 0x248
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Name: (ID 12) [
-CHECK-NEXT: Table Offset: 0x198
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x258
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_RCDATA (ID 10) [
-CHECK-NEXT: Table Offset: 0xD0
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: RANDOMDAT [
-CHECK-NEXT: Table Offset: 0x1B0
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 3
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x268
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: Language: (ID 2052) [
-CHECK-NEXT: Entry Offset: 0x278
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: Language: (ID 4103) [
-CHECK-NEXT: Entry Offset: 0x288
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-DAG: .rsrc$02 Data (
-CHECK-NEXT: 0000: 74686973 20697320 61207261 6E646F6D |this is a random|
-CHECK-NEXT: 0010: 20626974 206F6620 64617461 20746861 | bit of data tha|
-CHECK-NEXT: 0020: 74206D65 616E7320 6E6F7468 696E6700 |t means nothing.|
-CHECK-NEXT: 0030: A9230E14 F4F60000 7A686534 20736869 |.#......zhe4 shi|
-CHECK-NEXT: 0040: 34207969 31676534 20737569 326A6931 |4 yi1ge4 sui2ji1|
-CHECK-NEXT: 0050: 20646520 73687534 6A75342C 207A6865 | de shu4ju4, zhe|
-CHECK-NEXT: 0060: 34207969 34776569 347A6865 20736865 |4 yi4wei4zhe she|
-CHECK-NEXT: 0070: 6E326D65 00A9230E 14F4F600 00000000 |n2me..#.........|
-CHECK-NEXT: 0080: 44696573 20697374 2065696E 207A7566 |Dies ist ein zuf|
-CHECK-NEXT: 0090: C3A46C6C 69676573 20426974 20766F6E |..lliges Bit von|
-CHECK-NEXT: 00A0: 20446174 656E2C20 64696520 6E696368 | Daten, die nich|
-CHECK-NEXT: 00B0: 74732062 65646575 74657400 A9230E14 |ts bedeutet..#..|
-CHECK-NEXT: 00C0: F4F60000 00000000 11000300 E7030000 |................|
-CHECK-NEXT: 00D0: 0D004400 4C040000 82001200 BC010000 |..D.L...........|
-CHECK-NEXT: 00E0: 11000300 E7030000 0D004400 4C040000 |..........D.L...|
-CHECK-NEXT: 00F0: 82001200 BC010000 28000000 10000000 |........(.......|
-CHECK-NEXT: 0100: 10000000 01001800 00000000 00030000 |................|
-CHECK-NEXT: 0110: C40E0000 C40E0000 00000000 00000000 |................|
-CHECK-NEXT: 0120: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0130: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0140: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0150: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0160: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0170: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0180: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0190: FFFFFFFF FF7F7F7F 7C7C7C78 78787575 |........|||xxxuu|
-CHECK-NEXT: 01A0: 75FFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |u...............|
-CHECK-NEXT: 01B0: FFFFFFFF FFFFFFFF FFFFFFFF 979797FF |................|
-CHECK-NEXT: 01C0: FFFFFFFF FF838383 AAAAAADB DBDB7979 |..............yy|
-CHECK-NEXT: 01D0: 79757575 FFFFFFFF FFFFFFFF FFFFFFFF |yuuu............|
-CHECK-NEXT: 01E0: FFFFFFFF FFFFFFFF FFFFFFFF 9C9C9C98 |................|
-CHECK-NEXT: 01F0: 9898FFFF FF888888 DBDBDBB7 B7B77D7D |..............}}|
-CHECK-NEXT: 0200: 7DFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |}...............|
-CHECK-NEXT: 0210: FFFFFFFF FFFFFFFF FFFFFFFF A0A0A09C |................|
-CHECK-NEXT: 0220: 9C9C9393 93ADADAD F2F2F284 84848181 |................|
-CHECK-NEXT: 0230: 81FFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0240: FFFFFFFF FFFFFFFF FFFFFFFF A4A4A4D7 |................|
-CHECK-NEXT: 0250: D7D79D9D 9DD0D0D0 EEEEEE91 91918D8D |................|
-CHECK-NEXT: 0260: 8DFFFFFF FFFFFF81 81817E7E 7EFFFFFF |..........~~~...|
-CHECK-NEXT: 0270: FFFFFFFF FFFFFFFF FFFFFFFF A9A9A9F2 |................|
-CHECK-NEXT: 0280: F2F2E5E5 E5E2E2E2 95959591 91918D8D |................|
-CHECK-NEXT: 0290: 8D898989 868686FF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 02A0: FFFFFFFF FFFFFFFF FFFFFFFF ADADADF2 |................|
-CHECK-NEXT: 02B0: F2F2E1E1 E1DFDFDF E7E7E7E4 E4E4BBBB |................|
-CHECK-NEXT: 02C0: BB8E8E8E FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 02D0: FFFFFFFF FFFFFFFF FFFFFFFF B5B5B5F2 |................|
-CHECK-NEXT: 02E0: F2F2E8E8 E8E7E7E7 EAEAEAC6 C6C69E9E |................|
-CHECK-NEXT: 02F0: 9EFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0300: FFFFFFFF FFFFFFFF FFFFFFFF B9B9B9F4 |................|
-CHECK-NEXT: 0310: F4F4ECEC ECEDEDED CBCBCBA7 A7A7FFFF |................|
-CHECK-NEXT: 0320: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0330: FFFFFFFF FFFFFFFF FFFFFFFF BDBDBDF7 |................|
-CHECK-NEXT: 0340: F7F7EFEF EFD0D0D0 AFAFAFFF FFFFFFFF |................|
-CHECK-NEXT: 0350: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0360: FFFFFFFF FFFFFFFF FFFFFFFF C1C1C1F7 |................|
-CHECK-NEXT: 0370: F7F7D5D5 D5B6B6B6 FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0380: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0390: FFFFFFFF FFFFFFFF FFFFFFFF C4C4C4D9 |................|
-CHECK-NEXT: 03A0: D9D9BEBE BEFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 03B0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 03C0: FFFFFFFF FFFFFFFF FFFFFFFF C8C8C8C5 |................|
-CHECK-NEXT: 03D0: C5C5FFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 03E0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 03F0: FFFFFFFF FFFFFFFF FFFFFFFF CBCBCBFF |................|
-CHECK-NEXT: 0400: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0410: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0420: 28000000 10000000 10000000 01001800 |(...............|
-CHECK-NEXT: 0430: 00000000 00030000 C40E0000 C40E0000 |................|
-CHECK-NEXT: 0440: 00000000 00000000 FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0450: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0460: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0470: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0480: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0490: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 04A0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 04B0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 04C0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 04D0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 04E0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 04F0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0500: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0510: FFFFFFFF A0E3A901 B31801B3 1801B318 |................|
-CHECK-NEXT: 0520: 01B31801 B31801B3 1861D06F FFFFFFFF |.........a.o....|
-CHECK-NEXT: 0530: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0540: FFFFFFFF 01B31800 D7331CDB 49DBF9E2 |.........3..I...|
-CHECK-NEXT: 0550: 9BEFAF00 D73300D7 3301B318 FFFFFFFF |.....3..3.......|
-CHECK-NEXT: 0560: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0570: FFFFFFFF 01B31800 DE55F6FE F9DBFAE7 |.........U......|
-CHECK-NEXT: 0580: FEFFFE86 EFAE00DE 5501B318 FFFFFFFF |........U.......|
-CHECK-NEXT: 0590: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 05A0: FFFFFFFF 01B31800 E676DBFB EC00E676 |.........v.....v|
-CHECK-NEXT: 05B0: 57EFA5FB FFFD55EE A401B318 FFFFFFFF |W.....U.........|
-CHECK-NEXT: 05C0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 05D0: FFFFFFFF 01B31800 ED9800ED 9800ED98 |................|
-CHECK-NEXT: 05E0: 00ED9887 F7CFFEFF FF01B318 FFFFFFFF |................|
-CHECK-NEXT: 05F0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0600: FFFFFFFF 01B31800 F4BA00F4 BA00F4BA |................|
-CHECK-NEXT: 0610: 00F4BA00 F4BA9CFB E401B318 FFFFFFFF |................|
-CHECK-NEXT: 0620: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0630: FFFFFFFF 01B31800 FBDB00FB DB00FBDB |................|
-CHECK-NEXT: 0640: 00FBDB00 FBDB00FB DB01B318 FFFFFFFF |................|
-CHECK-NEXT: 0650: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0660: FFFFFFFF 9FE2A801 B31801B3 1801B318 |................|
-CHECK-NEXT: 0670: 01B31801 B31801B3 1861D06F FFFFFFFF |.........a.o....|
-CHECK-NEXT: 0680: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0690: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 06A0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 06B0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 06C0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 06D0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 06E0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 06F0: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0700: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0710: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0720: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0730: FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF |................|
-CHECK-NEXT: 0740: FFFFFFFF FFFFFFFF 00000000 00006400 |..............d.|
-CHECK-NEXT: 0750: 79007500 00000000 65007300 68006100 |y.u.....e.s.h.a.|
-CHECK-NEXT: 0760: 6C006100 00008000 66006B00 61006F00 |l.a.....f.k.a.o.|
-CHECK-NEXT: 0770: 79006100 00000000 0000C080 00000000 |y.a.............|
-CHECK-NEXT: 0780: 02000A00 0A00C800 2C010000 00005400 |........,.....T.|
-CHECK-NEXT: 0790: 65007300 74000000 01000250 00000000 |e.s.t......P....|
-CHECK-NEXT: 07A0: 0A000A00 E6000E00 0100FFFF 82004300 |..............C.|
-CHECK-NEXT: 07B0: 6F006E00 74006900 6E007500 65003A00 |o.n.t.i.n.u.e.:.|
-CHECK-NEXT: 07C0: 00000000 00000150 00000000 42008600 |.......P....B...|
-CHECK-NEXT: 07D0: A1000D00 0200FFFF 80002600 4F004B00 |..........&.O.K.|
-CHECK-NEXT: 07E0: 00000000 00000000 11005800 A4000000 |..........X.....|
-CHECK-NEXT: 07F0: 0D004800 2E160000 82001200 BC010000 |..H.............|
-CHECK-NEXT: 0800: 00000000 00006400 66006900 73006800 |......d.f.i.s.h.|
-CHECK-NEXT: 0810: 00000000 65007300 61006C00 61006400 |....e.s.a.l.a.d.|
-CHECK-NEXT: 0820: 00008000 66006400 75006300 6B000000 |....f.d.u.c.k...|
-CHECK-NEXT: 0830: 74686973 20697320 61207573 65722064 |this is a user d|
-CHECK-NEXT: 0840: 6566696E 65642072 65736F75 72636500 |efined resource.|
-CHECK-NEXT: 0850: 69742063 6F6E7461 696E7320 6D616E79 |it contains many|
-CHECK-NEXT: 0860: 20737472 696E6773 00000000 00000000 | strings........|
-CHECK-NEXT: )
diff --git a/llvm/test/tools/llvm-cvtres/help.test b/llvm/test/tools/llvm-cvtres/help.test
deleted file mode 100644
index ed76e1f126e..00000000000
--- a/llvm/test/tools/llvm-cvtres/help.test
+++ /dev/null
@@ -1,13 +0,0 @@
-; RUN: llvm-cvtres /h > %t
-; RUN: FileCheck -input-file=%t %s -check-prefix=HELP_TEST
-
-; HELP_TEST: OVERVIEW: Resource Converter
-; HELP_TEST-DAG: USAGE: cvtres [options] <inputs>
-; HELP_TEST-DAG: OPTIONS:
-; HELP_TEST-NEXT: /DEFINE:symbol
-; HELP_TEST-NEXT: /FOLDDUPS:
-; HELP_TEST-NEXT: /MACHINE:{ARM|EBC|IA64|X64|X86}
-; HELP_TEST-DAG: /NOLOGO
-; HELP_TEST-NEXT: /OUT:filename
-; HELP_TEST-NEXT: /READONLY
-; HELP_TEST-NEXT: /VERBOSE
diff --git a/llvm/test/tools/llvm-cvtres/machine.test b/llvm/test/tools/llvm-cvtres/machine.test
deleted file mode 100644
index 58096d1d8ed..00000000000
--- a/llvm/test/tools/llvm-cvtres/machine.test
+++ /dev/null
@@ -1,59 +0,0 @@
-// Check that cvtres properly generates COFF for different machine types. The
-// only things that changes with machine type are the machine constant listed
-// in the COFF header, and the relocation types in the relocation tables.
-// The input was generated with the following command, using the original Windows
-// rc.exe:
-// > rc /fo test_resource.res /nologo test_resource.rc
-// The object files we are comparing against were generated with these commands
-// using the original Windows cvtres.exe.
-// > cvtres /machine:X86 /readonly /nologo /out:test_resource.obj.coff \
-// test_resource.res
-// > cvtres /machine:X64 /readonly /nologo /out:test_resource.obj.coff.x64 \
-// test_resource.res
-// > cvtres /machine:ARM /readonly /nologo /out:test_resource.obj.coff.x64 \
-// test_resource.res
-
-RUN: llvm-cvtres /machine:X86 /out:%t %p/Inputs/test_resource.res
-RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=X86
-
-RUN: llvm-cvtres /machine:X64 /out:%t %p/Inputs/test_resource.res
-RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=X64
-
-RUN: llvm-cvtres /machine:ARM /out:%t %p/Inputs/test_resource.res
-RUN: llvm-readobj -h -relocations %t | FileCheck %s -check-prefix=ARM
-
-X86: Machine: IMAGE_FILE_MACHINE_I386 (0x14C)
-X86-DAG: Relocations [
-X86-DAG: .rsrc$01 {
-X86-NEXT: 0x1E8 IMAGE_REL_I386_DIR32NB $R000000
-X86-NEXT: 0x198 IMAGE_REL_I386_DIR32NB $R000018
-X86-NEXT: 0x1A8 IMAGE_REL_I386_DIR32NB $R000340
-X86-NEXT: 0x1C8 IMAGE_REL_I386_DIR32NB $R000668
-X86-NEXT: 0x1D8 IMAGE_REL_I386_DIR32NB $R000698
-X86-NEXT: 0x1F8 IMAGE_REL_I386_DIR32NB $R000708
-X86-NEXT: 0x1B8 IMAGE_REL_I386_DIR32NB $R000720
-X86-NEXT: 0x188 IMAGE_REL_I386_DIR32NB $R000750
-
-X64: Machine: IMAGE_FILE_MACHINE_AMD64 (0x8664)
-X64-DAG: Relocations [
-X64-DAG: .rsrc$01 {
-X64-NEXT: 0x1E8 IMAGE_REL_AMD64_ADDR32NB $R000000
-X64-NEXT: 0x198 IMAGE_REL_AMD64_ADDR32NB $R000018
-X64-NEXT: 0x1A8 IMAGE_REL_AMD64_ADDR32NB $R000340
-X64-NEXT: 0x1C8 IMAGE_REL_AMD64_ADDR32NB $R000668
-X64-NEXT: 0x1D8 IMAGE_REL_AMD64_ADDR32NB $R000698
-X64-NEXT: 0x1F8 IMAGE_REL_AMD64_ADDR32NB $R000708
-X64-NEXT: 0x1B8 IMAGE_REL_AMD64_ADDR32NB $R000720
-X64-NEXT: 0x188 IMAGE_REL_AMD64_ADDR32NB $R000750
-
-ARM: Machine: IMAGE_FILE_MACHINE_ARMNT (0x1C4)
-ARM-DAG: Relocations [
-ARM-DAG: .rsrc$01 {
-ARM-NEXT: 0x1E8 IMAGE_REL_ARM_ADDR32NB $R000000
-ARM-NEXT: 0x198 IMAGE_REL_ARM_ADDR32NB $R000018
-ARM-NEXT: 0x1A8 IMAGE_REL_ARM_ADDR32NB $R000340
-ARM-NEXT: 0x1C8 IMAGE_REL_ARM_ADDR32NB $R000668
-ARM-NEXT: 0x1D8 IMAGE_REL_ARM_ADDR32NB $R000698
-ARM-NEXT: 0x1F8 IMAGE_REL_ARM_ADDR32NB $R000708
-ARM-NEXT: 0x1B8 IMAGE_REL_ARM_ADDR32NB $R000720
-ARM-NEXT: 0x188 IMAGE_REL_ARM_ADDR32NB $R000750
diff --git a/llvm/test/tools/llvm-cvtres/object.test b/llvm/test/tools/llvm-cvtres/object.test
index 12373e0ac7f..8117ecc910c 100644
--- a/llvm/test/tools/llvm-cvtres/object.test
+++ b/llvm/test/tools/llvm-cvtres/object.test
@@ -3,138 +3,107 @@
// rc.exe:
// > rc /fo test_resource.res /nologo test_resource.rc
// The object file we are comparing against was generated with this command using
-// the original Windows cvtres.exe.
-// > cvtres /machine:X86 /readonly /nologo /out:test_resource.obj.coff \
-// test_resource.res
+// the original cvtres.
+// > cvtres /machine:X86 /readonly /nologo /out:test_resource.o test_resource.res
RUN: llvm-cvtres /out:%t %p/Inputs/test_resource.res
RUN: llvm-readobj -coff-resources -section-data %t | FileCheck %s
-CHECK: Resources [
-CHECK-NEXT: Total Number of Resources: 8
-CHECK-DAG: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 4
-CHECK-NEXT: Type: STRINGARRAY [
-CHECK-NEXT: Table Offset: 0x38
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: MYRESOURCE [
-CHECK-NEXT: Table Offset: 0xC8
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x188
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_BITMAP (ID 2) [
-CHECK-NEXT: Table Offset: 0x50
-CHECK-NEXT: Number of String Entries: 2
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: CURSOR [
-CHECK-NEXT: Table Offset: 0xE0
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x198
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Name: OKAY [
-CHECK-NEXT: Table Offset: 0xF8
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1A8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_MENU (ID 4) [
-CHECK-NEXT: Table Offset: 0x70
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Name: "EAT" [
-CHECK-NEXT: Table Offset: 0x110
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 3081) [
-CHECK-NEXT: Entry Offset: 0x1B8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Name: (ID 14432) [
-CHECK-NEXT: Table Offset: 0x128
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 2052) [
-CHECK-NEXT: Entry Offset: 0x1C8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_DIALOG (ID 5) [
-CHECK-NEXT: Table Offset: 0x90
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 0
-CHECK-NEXT: Name: TESTDIALOG [
-CHECK-NEXT: Table Offset: 0x140
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1D8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Type: kRT_ACCELERATOR (ID 9) [
-CHECK-NEXT: Table Offset: 0xA8
-CHECK-NEXT: Number of String Entries: 1
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Name: MYACCELERATORS [
-CHECK-NEXT: Table Offset: 0x158
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1E8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: Name: (ID 12) [
-CHECK-NEXT: Table Offset: 0x170
-CHECK-NEXT: Number of String Entries: 0
-CHECK-NEXT: Number of ID Entries: 1
-CHECK-NEXT: Language: (ID 1033) [
-CHECK-NEXT: Entry Offset: 0x1F8
-CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-CHECK-NEXT: Major Version: 0
-CHECK-NEXT: Minor Version: 0
-CHECK-NEXT: Characteristics: 0
-CHECK-NEXT: ]
-CHECK-NEXT: ]
-CHECK-NEXT: ]
+CHECK: Resources [
+CHECK-NEXT: String Name Entries: 1
+CHECK-NEXT: ID Entries: 4
+CHECK-NEXT: Type: STRINGARRAY [
+CHECK-NEXT: String Name Entries: 1
+CHECK-NEXT: ID Entries: 0
+CHECK-NEXT: Name: MYRESOURCE [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 1033) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Type: kRT_BITMAP (ID 2) [
+CHECK-NEXT: String Name Entries: 2
+CHECK-NEXT: ID Entries: 0
+CHECK-NEXT: Name: CURSOR [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 1033) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Name: OKAY [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 1033) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Type: kRT_MENU (ID 4) [
+CHECK-NEXT: String Name Entries: 1
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Name: "EAT" [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 3081) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Name: (ID 14432) [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 2052) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Type: kRT_DIALOG (ID 5) [
+CHECK-NEXT: String Name Entries: 1
+CHECK-NEXT: ID Entries: 0
+CHECK-NEXT: Name: TESTDIALOG [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 1033) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Type: kRT_ACCELERATOR (ID 9) [
+CHECK-NEXT: String Name Entries: 1
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Name: MYACCELERATORS [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 1033) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: Name: (ID 12) [
+CHECK-NEXT: String Name Entries: 0
+CHECK-NEXT: ID Entries: 1
+CHECK-NEXT: Language: (ID 1033) [
+CHECK-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+CHECK-NEXT: Major Version: 0
+CHECK-NEXT: Minor Version: 0
+CHECK-NEXT: ]
+CHECK-NEXT: ]
+CHECK-NEXT: ]
CHECK-DAG: .rsrc$02 Data (
CHECK-NEXT: 0000: 11000300 E7030000 0D004400 4C040000 |..........D.L...|
CHECK-NEXT: 0010: 82001200 BC010000 28000000 10000000 |........(.......|
diff --git a/llvm/test/tools/llvm-cvtres/parse.test b/llvm/test/tools/llvm-cvtres/parse.test
index 58c47143e69..23911ada82e 100644
--- a/llvm/test/tools/llvm-cvtres/parse.test
+++ b/llvm/test/tools/llvm-cvtres/parse.test
@@ -2,7 +2,7 @@
// rc.exe:
// > rc /fo test_resource.res /nologo test_resource.rc
-RUN: llvm-cvtres /verbose %p/Inputs/test_resource.res | FileCheck %s
+RUN: llvm-cvtres /verbose /out:%t %p/Inputs/test_resource.res | FileCheck %s
CHECK: Number of resources: 8
CHECK-NEXT: Resource Tree [
diff --git a/llvm/test/tools/llvm-readobj/resources.test b/llvm/test/tools/llvm-readobj/resources.test
index 589a9c968aa..855ce5393b8 100644
--- a/llvm/test/tools/llvm-readobj/resources.test
+++ b/llvm/test/tools/llvm-readobj/resources.test
@@ -9,135 +9,103 @@ RUN: | FileCheck %s -check-prefix ZERO
RUN: llvm-readobj -coff-resources %p/Inputs/resources/test_resource.obj.coff \
RUN: | FileCheck %s -check-prefix TEST_RES
-ZERO: Resources [
-ZERO-NEXT: Total Number of Resources: 1
-ZERO-NEXT: Base Table Address: 0x188
-ZERO-DAG: Number of String Entries: 0
-ZERO-NEXT: Number of ID Entries: 1
-ZERO-NEXT: Type: kRT_STRING (ID 6) [
-ZERO-NEXT: Table Offset: 0x18
-ZERO-NEXT: Number of String Entries: 0
-ZERO-NEXT: Number of ID Entries: 1
-ZERO-NEXT: Name: (ID 1) [
-ZERO-NEXT: Table Offset: 0x30
-ZERO-NEXT: Number of String Entries: 0
-ZERO-NEXT: Number of ID Entries: 1
-ZERO-NEXT: Language: (ID 1033) [
-ZERO-NEXT: Entry Offset: 0x48
-ZERO-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-ZERO-NEXT: Major Version: 0
-ZERO-NEXT: Minor Version: 0
-ZERO-NEXT: Characteristics: 0
-ZERO-NEXT: ]
-ZERO-NEXT: ]
-ZERO-NEXT: ]
+ZERO: Resources [
+ZERO-NEXT: String Name Entries: 0
+ZERO-NEXT: ID Entries: 1
+ZERO-NEXT: Type: kRT_STRING (ID 6) [
+ZERO-NEXT: String Name Entries: 0
+ZERO-NEXT: ID Entries: 1
+ZERO-NEXT: Name: (ID 1) [
+ZERO-NEXT: String Name Entries: 0
+ZERO-NEXT: ID Entries: 1
+ZERO-NEXT: Language: (ID 1033) [
+ZERO-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+ZERO-NEXT: Major Version: 0
+ZERO-NEXT: Minor Version: 0
+ZERO-NEXT: ]
+ZERO-NEXT: ]
+ZERO-NEXT: ]
-TEST_RES: Resources [
-TEST_RES-NEXT: Total Number of Resources: 7
-TEST_RES-NEXT: Base Table Address: 0x1C0
-TEST_RES-DAG: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 4
-TEST_RES-NEXT: Type: kRT_BITMAP (ID 2) [
-TEST_RES-NEXT: Table Offset: 0x30
-TEST_RES-NEXT: Number of String Entries: 2
-TEST_RES-NEXT: Number of ID Entries: 0
-TEST_RES-NEXT: Name: CURSOR [
-TEST_RES-NEXT: Table Offset: 0xA8
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 1033) [
-TEST_RES-NEXT: Entry Offset: 0x150
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: Name: OKAY [
-TEST_RES-NEXT: Table Offset: 0xC0
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 1033) [
-TEST_RES-NEXT: Entry Offset: 0x160
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: Type: kRT_MENU (ID 4) [
-TEST_RES-NEXT: Table Offset: 0x50
-TEST_RES-NEXT: Number of String Entries: 1
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Name: "EAT" [
-TEST_RES-NEXT: Table Offset: 0xD8
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 3081) [
-TEST_RES-NEXT: Entry Offset: 0x170
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: Name: (ID 14432) [
-TEST_RES-NEXT: Table Offset: 0xF0
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 2052) [
-TEST_RES-NEXT: Entry Offset: 0x180
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: Type: kRT_DIALOG (ID 5) [
-TEST_RES-NEXT: Table Offset: 0x70
-TEST_RES-NEXT: Number of String Entries: 1
-TEST_RES-NEXT: Number of ID Entries: 0
-TEST_RES-NEXT: Name: TESTDIALOG [
-TEST_RES-NEXT: Table Offset: 0x108
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 1033) [
-TEST_RES-NEXT: Entry Offset: 0x190
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: Type: kRT_ACCELERATOR (ID 9) [
-TEST_RES-NEXT: Table Offset: 0x88
-TEST_RES-NEXT: Number of String Entries: 1
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Name: MYACCELERATORS [
-TEST_RES-NEXT: Table Offset: 0x120
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 1033) [
-TEST_RES-NEXT: Entry Offset: 0x1A0
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: Name: (ID 12) [
-TEST_RES-NEXT: Table Offset: 0x138
-TEST_RES-NEXT: Number of String Entries: 0
-TEST_RES-NEXT: Number of ID Entries: 1
-TEST_RES-NEXT: Language: (ID 1033) [
-TEST_RES-NEXT: Entry Offset: 0x1B0
-TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
-TEST_RES-NEXT: Major Version: 0
-TEST_RES-NEXT: Minor Version: 0
-TEST_RES-NEXT: Characteristics: 0
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
-TEST_RES-NEXT: ]
+
+TEST_RES: Resources [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 4
+TEST_RES-NEXT: Type: kRT_BITMAP (ID 2) [
+TEST_RES-NEXT: String Name Entries: 2
+TEST_RES-NEXT: ID Entries: 0
+TEST_RES-NEXT: Name: CURSOR [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 1033) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: Name: OKAY [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 1033) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: Type: kRT_MENU (ID 4) [
+TEST_RES-NEXT: String Name Entries: 1
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Name: "EAT" [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 3081) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: Name: (ID 14432) [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 2052) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: Type: kRT_DIALOG (ID 5) [
+TEST_RES-NEXT: String Name Entries: 1
+TEST_RES-NEXT: ID Entries: 0
+TEST_RES-NEXT: Name: TESTDIALOG [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 1033) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: Type: kRT_ACCELERATOR (ID 9) [
+TEST_RES-NEXT: String Name Entries: 1
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Name: MYACCELERATORS [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 1033) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: Name: (ID 12) [
+TEST_RES-NEXT: String Name Entries: 0
+TEST_RES-NEXT: ID Entries: 1
+TEST_RES-NEXT: Language: (ID 1033) [
+TEST_RES-NEXT: Time/Date Stamp: 1970-01-01 00:00:00 (0x0)
+TEST_RES-NEXT: Major Version: 0
+TEST_RES-NEXT: Minor Version: 0
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
+TEST_RES-NEXT: ]
OpenPOWER on IntegriCloud