[Lldb-commits] [lldb] 75acec8 - [lldb] Fix enums-layout test on Windows

[Stella Stamenova via lldb-commits]

Author: Stella Stamenova
Date: 2022-05-26T12:16:52-07:00
New Revision: 75acec818e3a419836cf4827eb64faee719becb8

URL: https://github.com/llvm/llvm-project/commit/75acec818e3a419836cf4827eb64faee719becb8
DIFF: https://github.com/llvm/llvm-project/commit/75acec818e3a419836cf4827eb64faee719becb8.diff

LOG: [lldb] Fix enums-layout test on Windows

The test was broken by: https://reviews.llvm.org/D125604

Added: 
    

Modified: 
    lldb/test/Shell/SymbolFile/PDB/enums-layout.test

Removed: 
    


################################################################################
diff  --git a/lldb/test/Shell/SymbolFile/PDB/enums-layout.test b/lldb/test/Shell/SymbolFile/PDB/enums-layout.test
index 2bfb9eb0b7f28..ad7d1549e3620 100644
--- a/lldb/test/Shell/SymbolFile/PDB/enums-layout.test
+++ b/lldb/test/Shell/SymbolFile/PDB/enums-layout.test
@@ -1,45 +1,45 @@
 REQUIRES: system-windows, msvc
 RUN: %build --compiler=msvc --arch=32 --nodefaultlib --output=%T/SimpleTypesTest.cpp.enums.exe %S/Inputs/SimpleTypesTest.cpp
 RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM %s
-RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM_CONST %s
-RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM_EMPTY %s
-RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM_UCHAR %s
-RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM_CLASS %s
-RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=ENUM_STRUCT %s
+RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CONST-ENUM %s
+RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=EMPTY-ENUM %s
+RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=UCHAR-ENUM %s
+RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=CLASS-ENUM %s
+RUN: lldb-test symbols %T/SimpleTypesTest.cpp.enums.exe | FileCheck --check-prefix=STRUCT-ENUM %s
 
 ; FIXME: PDB does not have information about scoped enumeration (Enum class) so the  
 ; compiler type used is the same as the one for unscoped enumeration.
 
 ENUM:      Type{{.*}} , name = "Enum", size = 4, decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:19, compiler_type = {{.*}} enum Enum {
-ENUM_NEXT:    RED,
-ENUM_NEXT:    GREEN,
-ENUM_NEXT:    BLUE
-ENUM_NEXT:}
+ENUM-NEXT:    RED,
+ENUM-NEXT:    GREEN,
+ENUM-NEXT:    BLUE
+ENUM-NEXT:}
 
-ENUM_CONST:      Type{{.*}} , name = "EnumConst", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:22, compiler_type = {{.*}} enum EnumConst {
-ENUM_CONST-NEXT:    LOW,
-ENUM_CONST-NEXT:    NORMAL,
-ENUM_CONST-NEXT:    HIGH
-ENUM_CONST-NEXT:}
+CONST-ENUM:      Type{{.*}} , name = "EnumConst", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:22, compiler_type = {{.*}} enum EnumConst {
+CONST-ENUM-NEXT:    LOW,
+CONST-ENUM-NEXT:    NORMAL,
+CONST-ENUM-NEXT:    HIGH
+CONST-ENUM-NEXT:}
 
-ENUM_EMPTY:      Type{{.*}} , name = "EnumEmpty", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:25, compiler_type = {{.*}} enum EnumEmpty {
-ENUM_EMPTY-NEXT:}
+EMPTY-ENUM:      Type{{.*}} , name = "EnumEmpty", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:25, compiler_type = {{.*}} enum EnumEmpty {
+EMPTY-ENUM-NEXT:}
 
-ENUM_UCHAR:      Type{{.*}} , name = "EnumUChar", size = 1,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:28, compiler_type = {{.*}} enum EnumUChar {
-ENUM_UCHAR-NEXT:    ON,
-ENUM_UCHAR-NEXT:    OFF,
-ENUM_UCHAR-NEXT:    AUTO
-ENUM_UCHAR-NEXT:}
+UCHAR-ENUM:      Type{{.*}} , name = "EnumUChar", size = 1,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:28, compiler_type = {{.*}} enum EnumUChar {
+UCHAR-ENUM-NEXT:    ON,
+UCHAR-ENUM-NEXT:    OFF,
+UCHAR-ENUM-NEXT:    AUTO
+UCHAR-ENUM-NEXT:}
 
 ; Note that `enum EnumClass` is tested instead of `enum class EnumClass`
-ENUM_CLASS:      Type{{.*}} , name = "EnumClass", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:32, compiler_type = {{.*}} enum EnumClass {
-ENUM_CLASS-NEXT:    YES,
-ENUM_CLASS-NEXT:    NO,
-ENUM_CLASS-NEXT:    DEFAULT
-ENUM_CLASS-NEXT:}
+CLASS-ENUM:      Type{{.*}} , name = "EnumClass", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:32, compiler_type = {{.*}} enum EnumClass {
+CLASS-ENUM-NEXT:    YES,
+CLASS-ENUM-NEXT:    NO,
+CLASS-ENUM-NEXT:    DEFAULT
+CLASS-ENUM-NEXT:}
 
-ENUM_STRUCT:      Type{{.*}} , name = "EnumStruct", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:35, compiler_type = {{.*}} enum EnumStruct {
-ENUM_STRUCT-NEXT:    red,
-ENUM_STRUCT-NEXT:    blue,
-ENUM_STRUCT-NEXT:    black
-ENUM_STRUCT-NEXT:}
+STRUCT-ENUM:      Type{{.*}} , name = "EnumStruct", size = 4,  decl = {{[Ss]}}imple{{[Tt]}}ypes{{[Tt]}}est.cpp:35, compiler_type = {{.*}} enum EnumStruct {
+STRUCT-ENUM-NEXT:    red,
+STRUCT-ENUM-NEXT:    blue,
+STRUCT-ENUM-NEXT:    black
+STRUCT-ENUM-NEXT:}