@@ -1832,10 +1832,10 @@ TEST_F(EvalTest, TestStaticConstDeclaredInline) {
18321832 EXPECT_THAT (Eval (" outer::Vars::inline_static" ), IsEqual (" 4.5" ));
18331833 EXPECT_THAT (Eval (" outer::Vars::static_constexpr" ), IsEqual (" 5" ));
18341834
1835- EXPECT_THAT (Eval (" ::Vars::inline_static" ), XFail ( IsEqual (" 7.5" ) ));
1836- EXPECT_THAT (Eval (" ::Vars::static_constexpr" ), XFail ( IsEqual (" 8" ) ));
1837- EXPECT_THAT (Eval (" Vars::inline_static" ), XFail ( IsEqual (" 7.5" ) ));
1838- EXPECT_THAT (Eval (" Vars::static_constexpr" ), XFail ( IsEqual (" 8" ) ));
1835+ EXPECT_THAT (Eval (" ::Vars::inline_static" ), IsEqual (" 7.5" ));
1836+ EXPECT_THAT (Eval (" ::Vars::static_constexpr" ), IsEqual (" 8" ));
1837+ EXPECT_THAT (Eval (" Vars::inline_static" ), IsEqual (" 7.5" ));
1838+ EXPECT_THAT (Eval (" Vars::static_constexpr" ), IsEqual (" 8" ));
18391839}
18401840
18411841#ifndef __EMSCRIPTEN__
@@ -1859,16 +1859,16 @@ TEST_F(EvalTest, TestStaticConstDeclaredOutsideTheClass) {
18591859 EXPECT_THAT (Eval (" outer::inner::Vars::static_const" ), IsEqual (" 3" ));
18601860 EXPECT_THAT (Eval (" ::outer::Vars::static_const" ), IsEqual (" 6" ));
18611861 EXPECT_THAT (Eval (" outer::Vars::static_const" ), IsEqual (" 6" ));
1862- EXPECT_THAT (Eval (" ::Vars::static_const" ), XFail ( IsEqual (" 9" ) ));
1863- EXPECT_THAT (Eval (" Vars::static_const" ), XFail ( IsEqual (" 9" ) ));
1862+ EXPECT_THAT (Eval (" ::Vars::static_const" ), IsEqual (" 9" ));
1863+ EXPECT_THAT (Eval (" Vars::static_const" ), IsEqual (" 9" ));
18641864
18651865 EXPECT_THAT (Eval (" ::outer::inner::Vars::Nested::static_const" ),
18661866 IsEqual (" 10" ));
18671867 EXPECT_THAT (Eval (" outer::inner::Vars::Nested::static_const" ), IsEqual (" 10" ));
18681868 EXPECT_THAT (Eval (" ::outer::Vars::Nested::static_const" ), IsEqual (" 20" ));
18691869 EXPECT_THAT (Eval (" outer::Vars::Nested::static_const" ), IsEqual (" 20" ));
1870- EXPECT_THAT (Eval (" ::Vars::Nested::static_const" ), XFail ( IsEqual (" 30" ) ));
1871- EXPECT_THAT (Eval (" Vars::Nested::static_const" ), XFail ( IsEqual (" 30" ) ));
1870+ EXPECT_THAT (Eval (" ::Vars::Nested::static_const" ), IsEqual (" 30" ));
1871+ EXPECT_THAT (Eval (" Vars::Nested::static_const" ), IsEqual (" 30" ));
18721872}
18731873
18741874#ifndef __EMSCRIPTEN__
@@ -2070,8 +2070,8 @@ TEST_F(EvalTest, TestTemplateTypes) {
20702070 EXPECT_THAT (
20712071 Eval (" ns::T_1<ns::T_1<int> >::cx" ),
20722072 IsError (" use of undeclared identifier 'ns::T_1<ns::T_1<int> >::cx'" ));
2073- EXPECT_THAT (Eval (" T_1<int>::cx" ), XFail ( IsEqual (" 24" ) ));
2074- EXPECT_THAT (Eval (" T_1<double>::cx" ), XFail ( IsEqual (" 42" ) ));
2073+ EXPECT_THAT (Eval (" T_1<int>::cx" ), IsEqual (" 24" ));
2074+ EXPECT_THAT (Eval (" T_1<double>::cx" ), IsEqual (" 42" ));
20752075 EXPECT_THAT (Eval (" ns::T_1<int>::cx" ), IsEqual (" 64" ));
20762076
20772077 for (std::string arg : {" int" , " int*" , " int**" , " int&" , " int*&" }) {
@@ -2115,7 +2115,7 @@ TEST_F(EvalTest, TestTemplateCpp11) {
21152115 EXPECT_THAT (Eval (" T_1<2>>1" ),
21162116 IsError (" <expr:1:7>: Unexpected token: <'>' (greater)>" ));
21172117 // And here it's a template.
2118- EXPECT_THAT (Eval (" T_1<int>::cx + 1" ), XFail ( IsEqual (" 25" ) ));
2118+ EXPECT_THAT (Eval (" T_1<int>::cx + 1" ), IsEqual (" 25" ));
21192119}
21202120
21212121TEST_F (EvalTest, TestTemplateWithNumericArguments) {
0 commit comments