[llvm-rc] Add missing inputs for tag-icon-cursor.test.

[mstorsjo]

Summary

This adds the missing input files used for this test, except for the separate input files for specific error cases; matching test input files were provided by Nico Weber. (I found test input files at https://github.com/nico/hack/tree/master/res/test that seem to match most of the missing ones for the existing icon/cursor test.)

The extra copying of files into the %t directory doesn't seem to be necessary since that directory only ever is used for output here, not for inputs.

[mstorsjo]

test/tools/llvm-rc/tag-icon-cursor.test

159 ↗

(On Diff #146528)

FWIW, the previous value here seems to be what rc.exe produces, so something is wrong in the current codebase. But improving the test coverage for the current code as it stands probably also is worthwhile, even if there are known issues?

[amccarth]

test/tools/llvm-rc/tag-icon-cursor.test

159 ↗

(On Diff #146528)

From the Wikipedia info on the ICO format, this appears to be the bits-per-pixel field (assuming it's an icon and not a cursor). There's a note that says the field may be 0 (in most cases) because the bits-per-pixel can (usually) be inferred.

My guess is the source file has 0 and llvm-rc copies it verbatim while rc.exe infers the BPP and sets it explicitly. In theory, it should work either way.

Maybe add a comment here so that if we ever do match rc.exe, nobody has to sweat the details to make the test pass.

[amccarth]

Ah, I see you figured out the discrepancy in a follow-on patch (46816), so this LGTM.

llvm/trunk/test/tools/llvm-rc/tag-icon-cursor.test

-; This .ico file used to write this test was lost when the author left
-; before comitting, and the binary wasn't uploaded to Phabricator.  This
-; will be fixed as soon as we can recover the file.
-; XFAIL: *
 ; RUN: rm -rf %t
 ; RUN: mkdir %t
-; RUN: cd %t
-; RUN: cp %p/Inputs/icon*.ico .
-; RUN: cp %p/Inputs/cursor*.cur .
-; RUN: cp %p/Inputs/tag-icon-cursor-nonsense.rc .
 
 ; RUN: llvm-rc /FO %t/tag-icon-cursor.res %p/Inputs/tag-icon-cursor.rc
 ; RUN: llvm-readobj %t/tag-icon-cursor.res | FileCheck %s
 
 ; CHECK: Resource type (int): 1
 ; CHECK-NEXT: Resource name (int): 1
 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1010

 ; CHECK-NEXT: Data version: 0
 ; CHECK-NEXT: Memory flags: 0x1030
 ; CHECK-NEXT: Language ID: 1033
 ; CHECK-NEXT: Version (major): 0
 ; CHECK-NEXT: Version (minor): 0
 ; CHECK-NEXT: Characteristics: 0
 ; CHECK-NEXT: Data size: 62
 ; CHECK-NEXT: Data: (
-; CHECK-NEXT:   0000: 00000100 04001010 00000100 20006804  |............ .h.|
+; CHECK-NEXT:   0000: 00000100 04001010 00000100 00006804  |..............h.|
 ; CHECK-NEXT:   0010: 00000300 18180000 01002000 88090000  |.......... .....|
 ; CHECK-NEXT:   0020: 04002020 00000100 2000A810 00000500  |..  .... .......|
 ; CHECK-NEXT:   0030: 30300000 01002000 A8250000 0600      |00.... ..%....|
 ; CHECK-NEXT: )
 
 ; CHECK-DAG:  Resource type (int): 1
 ; CHECK-NEXT: Resource name (int): 7
 ; CHECK-NEXT: Data version: 0

 ; CHECK-NEXT: Data: (
 ; CHECK-NEXT:   0000: 00000100 01001010 00000100 20005200  |............ .R.|
 ; CHECK-NEXT:   0010: 00000C00                             |....|
 ; CHECK-NEXT: )
 
 
 ; RUN: not llvm-rc /FO %t/1 %p/Inputs/tag-icon-cursor-nonexistent.rc 2>&1 | FileCheck %s --check-prefix NOFILE
 ; NOFILE: llvm-rc: Error in CURSOR statement (ID 500):
-; NOFILE-NEXT: Error opening cursor 'this-file-does-not-exist.cur':
+; NOFILE-NEXT: file not found : this-file-does-not-exist.cur
 
 
 ; RUN: not llvm-rc /FO %t/1 %p/Inputs/tag-icon-cursor-nonsense.rc 2>&1 | FileCheck %s --check-prefix NONSENSE
 
 ; NONSENSE: llvm-rc: Error in ICON statement (ID 1):
 ; NONSENSE-NEXT: Incorrect icon/cursor Reserved field; should be 0.
-
-
-; RUN: not llvm-rc /FO %t/1 %p/Inputs/tag-icon-cursor-eof.rc 2>&1 | FileCheck %s --check-prefix EOF
-
-; EOF: llvm-rc: Error in CURSOR statement (ID 72):
-; EOF-NEXT: Stream Error: The stream is too short to perform the requested operation.
-
-
-; RUN: not llvm-rc /FO %t/1 %p/Inputs/tag-icon-cursor-bad-offset.rc 2>&1 | FileCheck %s --check-prefix OFFSET
-
-; OFFSET: llvm-rc: Error in CURSOR statement (ID 50):
-; OFFSET-NEXT: Stream Error: The specified offset is invalid for the current stream.
-
-
-; RUN: not llvm-rc /FO %t/1 %p/Inputs/tag-icon-cursor-bad-type.rc 2>&1 | FileCheck %s --check-prefix BADTYPE
-
-; BADTYPE: llvm-rc: Error in ICON statement (ID 100):
-; BADTYPE-NEXT: Incorrect icon/cursor ResType field; should be 1.