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

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.

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.

Differential Revision: https://reviews.llvm.org/D46813

llvm-svn: 332297

diff --git a/llvm/test/tools/llvm-rc/Inputs/cursor-32.cur b/llvm/test/tools/llvm-rc/Inputs/cursor-32.cur
new file mode 100644 (file)
index 0000000..47967fe
Binary files /dev/null and b/llvm/test/tools/llvm-rc/Inputs/cursor-32.cur differ

diff --git a/llvm/test/tools/llvm-rc/Inputs/cursor-8.cur b/llvm/test/tools/llvm-rc/Inputs/cursor-8.cur
new file mode 100644 (file)
index 0000000..c3d21aa
Binary files /dev/null and b/llvm/test/tools/llvm-rc/Inputs/cursor-8.cur differ

diff --git a/llvm/test/tools/llvm-rc/Inputs/cursor.cur b/llvm/test/tools/llvm-rc/Inputs/cursor.cur
new file mode 100644 (file)
index 0000000..f849d47
Binary files /dev/null and b/llvm/test/tools/llvm-rc/Inputs/cursor.cur differ

diff --git a/llvm/test/tools/llvm-rc/Inputs/icon-new.ico b/llvm/test/tools/llvm-rc/Inputs/icon-new.ico
new file mode 100644 (file)
index 0000000..dad43e7
Binary files /dev/null and b/llvm/test/tools/llvm-rc/Inputs/icon-new.ico differ

diff --git a/llvm/test/tools/llvm-rc/Inputs/icon-old.ico b/llvm/test/tools/llvm-rc/Inputs/icon-old.ico
new file mode 100644 (file)
index 0000000..6d60c59
Binary files /dev/null and b/llvm/test/tools/llvm-rc/Inputs/icon-old.ico differ

diff --git a/llvm/test/tools/llvm-rc/Inputs/icon-png.ico b/llvm/test/tools/llvm-rc/Inputs/icon-png.ico
new file mode 100644 (file)
index 0000000..7e01acb
Binary files /dev/null and b/llvm/test/tools/llvm-rc/Inputs/icon-png.ico differ

diff --git a/llvm/test/tools/llvm-rc/tag-icon-cursor.test b/llvm/test/tools/llvm-rc/tag-icon-cursor.test
index 406ec1a..59fae38 100644 (file)
--- a/llvm/test/tools/llvm-rc/tag-icon-cursor.test
+++ b/llvm/test/tools/llvm-rc/tag-icon-cursor.test
@@ -1,13 +1,5 @@
-; 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
@@ -164,7 +156,7 @@
 ; 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.... ..%....|
@@ -330,28 +322,10 @@
 
 ; 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.