shafik updated this revision to Diff 197178.
shafik added a comment.
Fred is correct, I mistakenly thought the parts of the test that were working
were being covered elsewhere but that is not the case. So I have reworked this
change to instead of skipping the whole test to comment out the inline
expressions that are specifically broken.
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D61266/new/
https://reviews.llvm.org/D61266
Files:
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
Index:
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
===================================================================
---
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
+++
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
@@ -42,10 +42,14 @@
(void)C<int,16,32>().isSixteenThirtyTwo();
(void)C<int,16>().isSixteenThirtyTwo();
(void)(myC.member != 64); //% self.expect("expression -- myC",
DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"])
- //% self.expect("expression -- C<int,
16>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs =
["false"])
- //% self.expect("expression -- C<int, 16,
32>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
//% self.expect("expression --
myLesserC.isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs =
["false"])
//% self.expect("expression --
myC.isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
+
+ // Commenting out some of the expressions
because they work for the wrong reasons and will break all together
+ // once we stop injecting all the local
variables into an expression. This case will have to be fixed with
+ // a future set of changes.
+ //#% self.expect("expression -- C<int,
16>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs =
["false"])
+ //#% self.expect("expression -- C<int, 16,
32>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
D<int,int,bool> myD;
D<int,int> myLesserD;
@@ -53,8 +57,10 @@
(void)D<int,int,bool>().isIntBool();
(void)D<int,int>().isIntBool();
return myD.member != 64; //% self.expect("expression -- myD",
DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"])
- //% self.expect("expression -- D<int,
int>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
- //% self.expect("expression -- D<int, int,
bool>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
//% self.expect("expression --
myLesserD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
//% self.expect("expression --
myD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
+
+ // See comment above.
+ //#% self.expect("expression -- D<int,
int>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
+ //#% self.expect("expression -- D<int, int,
bool>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
}
Index:
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
===================================================================
---
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
+++
packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
@@ -4,6 +4,4 @@
lldbinline.MakeInlineTest(
__file__, globals(), [
decorators.expectedFailureAll(
- compiler="gcc"),
- # rdar://problem/48128064
- decorators.skipIfDarwin])
+ compiler="gcc")])
Index: packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
===================================================================
--- packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
+++ packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/main.cpp
@@ -42,10 +42,14 @@
(void)C<int,16,32>().isSixteenThirtyTwo();
(void)C<int,16>().isSixteenThirtyTwo();
(void)(myC.member != 64); //% self.expect("expression -- myC", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"])
- //% self.expect("expression -- C<int, 16>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
- //% self.expect("expression -- C<int, 16, 32>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
//% self.expect("expression -- myLesserC.isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
//% self.expect("expression -- myC.isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
+
+ // Commenting out some of the expressions because they work for the wrong reasons and will break all together
+ // once we stop injecting all the local variables into an expression. This case will have to be fixed with
+ // a future set of changes.
+ //#% self.expect("expression -- C<int, 16>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
+ //#% self.expect("expression -- C<int, 16, 32>().isSixteenThirtyTwo()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
D<int,int,bool> myD;
D<int,int> myLesserD;
@@ -53,8 +57,10 @@
(void)D<int,int,bool>().isIntBool();
(void)D<int,int>().isIntBool();
return myD.member != 64; //% self.expect("expression -- myD", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["64"])
- //% self.expect("expression -- D<int, int>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
- //% self.expect("expression -- D<int, int, bool>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
//% self.expect("expression -- myLesserD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
//% self.expect("expression -- myD.isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
+
+ // See comment above.
+ //#% self.expect("expression -- D<int, int>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["false"])
+ //#% self.expect("expression -- D<int, int, bool>().isIntBool()", DATA_TYPES_DISPLAYED_CORRECTLY, substrs = ["true"])
}
Index: packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
===================================================================
--- packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
+++ packages/Python/lldbsuite/test/lang/cpp/class-template-parameter-pack/TestClassTemplateParameterPack.py
@@ -4,6 +4,4 @@
lldbinline.MakeInlineTest(
__file__, globals(), [
decorators.expectedFailureAll(
- compiler="gcc"),
- # rdar://problem/48128064
- decorators.skipIfDarwin])
+ compiler="gcc")])
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
