Index: test/tools/llvm-rc/tag-icon-cursor.test =================================================================== --- test/tools/llvm-rc/tag-icon-cursor.test +++ 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.