diff options
| author | Zachary Turner <zturner@google.com> | 2017-10-06 20:51:20 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-10-06 20:51:20 +0000 |
| commit | 420090af89bacc97ce9c9c28eb3d32d0c704ca53 (patch) | |
| tree | e7e7c3a236813be6ef8dfdcde0f3c7f1ba847fdf /llvm/test/tools/llvm-rc/parser.test | |
| parent | e9baea817822ec183f521c444b37d257aabbc655 (diff) | |
| download | bcm5719-llvm-420090af89bacc97ce9c9c28eb3d32d0c704ca53.tar.gz bcm5719-llvm-420090af89bacc97ce9c9c28eb3d32d0c704ca53.zip | |
[llvm-rc] Add optional serialization support for DIALOG(EX) resources.
This is part 5 of llvm-rc serialization support.
This allows DIALOG and DIALOGEX to serialize if dialog-specific optional
statements are provided. These are (as of now): CAPTION, FONT, and
STYLE.
Notably, FONT statement can take more than two arguments when describing
DIALOGEX resources (as in
msdn.microsoft.com/en-us/library/windows/desktop/aa381013.aspx). I made
some changes to the parser to reflect this fact.
Patch by Marek Sokolowski
Differential Revision: https://reviews.llvm.org/D37864
llvm-svn: 315104
Diffstat (limited to 'llvm/test/tools/llvm-rc/parser.test')
| -rw-r--r-- | llvm/test/tools/llvm-rc/parser.test | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/llvm/test/tools/llvm-rc/parser.test b/llvm/test/tools/llvm-rc/parser.test index f54311202aa..e2950776bac 100644 --- a/llvm/test/tools/llvm-rc/parser.test +++ b/llvm/test/tools/llvm-rc/parser.test @@ -53,7 +53,7 @@ ; PGOOD-NEXT: Option: Language: 1, Sublanguage: 2 ; PGOOD-NEXT: Option: Characteristics: 50 ; PGOOD-NEXT: Option: Version: 100 -; PGOOD-NEXT: Option: Font: size = 12, face = "Arial" +; PGOOD-NEXT: Option: Font: size = 12, face = "Arial", weight = 500, italic, charset = 13 ; PGOOD-NEXT: Option: Caption: "RC parser dialog" ; PGOOD-NEXT: Option: Style: 332340 ; PGOOD-NEXT: Control (14): LTEXT, title: "Hello world!", loc: (20, 20), size: [50, 50] @@ -220,6 +220,11 @@ ; PDIALOG5: llvm-rc: Error parsing file: expected '-', '~', integer or '(', got "This shouldn't be here" +; RUN: not llvm-rc /dry-run /V %p/Inputs/parser-dialog-simple-font.rc 2>&1 | FileCheck %s --check-prefix PDIALOG6 + +; PDIALOG6: llvm-rc: Error parsing file: expected identifier, got , + + ; RUN: not llvm-rc /dry-run /V %p/Inputs/parser-versioninfo-wrong-fixed.rc 2>&1 | FileCheck %s --check-prefix PVERSIONINFO1 ; PVERSIONINFO1: llvm-rc: Error parsing file: expected fixed VERSIONINFO statement type, got WEIRDFIXED |
