@@ -1831,10 +1831,10 @@ TEST_F(EvalTest, TestStaticConstDeclaredInline) {
18311831 EXPECT_THAT (Eval (" outer::Vars::inline_static" ), IsEqual (" 4.5" ));
18321832 EXPECT_THAT (Eval (" outer::Vars::static_constexpr" ), IsEqual (" 5" ));
18331833
1834- EXPECT_THAT (Eval (" ::Vars::inline_static" ), XFail ( IsEqual (" 7.5" ) ));
1835- EXPECT_THAT (Eval (" ::Vars::static_constexpr" ), XFail ( IsEqual (" 8" ) ));
1836- EXPECT_THAT (Eval (" Vars::inline_static" ), XFail ( IsEqual (" 7.5" ) ));
1837- EXPECT_THAT (Eval (" Vars::static_constexpr" ), XFail ( IsEqual (" 8" ) ));
1834+ EXPECT_THAT (Eval (" ::Vars::inline_static" ), IsEqual (" 7.5" ));
1835+ EXPECT_THAT (Eval (" ::Vars::static_constexpr" ), IsEqual (" 8" ));
1836+ EXPECT_THAT (Eval (" Vars::inline_static" ), IsEqual (" 7.5" ));
1837+ EXPECT_THAT (Eval (" Vars::static_constexpr" ), IsEqual (" 8" ));
18381838}
18391839
18401840#ifndef __EMSCRIPTEN__
@@ -1858,16 +1858,16 @@ TEST_F(EvalTest, TestStaticConstDeclaredOutsideTheClass) {
18581858 EXPECT_THAT (Eval (" outer::inner::Vars::static_const" ), IsEqual (" 3" ));
18591859 EXPECT_THAT (Eval (" ::outer::Vars::static_const" ), IsEqual (" 6" ));
18601860 EXPECT_THAT (Eval (" outer::Vars::static_const" ), IsEqual (" 6" ));
1861- EXPECT_THAT (Eval (" ::Vars::static_const" ), XFail ( IsEqual (" 9" ) ));
1862- EXPECT_THAT (Eval (" Vars::static_const" ), XFail ( IsEqual (" 9" ) ));
1861+ EXPECT_THAT (Eval (" ::Vars::static_const" ), IsEqual (" 9" ));
1862+ EXPECT_THAT (Eval (" Vars::static_const" ), IsEqual (" 9" ));
18631863
18641864 EXPECT_THAT (Eval (" ::outer::inner::Vars::Nested::static_const" ),
18651865 IsEqual (" 10" ));
18661866 EXPECT_THAT (Eval (" outer::inner::Vars::Nested::static_const" ), IsEqual (" 10" ));
18671867 EXPECT_THAT (Eval (" ::outer::Vars::Nested::static_const" ), IsEqual (" 20" ));
18681868 EXPECT_THAT (Eval (" outer::Vars::Nested::static_const" ), IsEqual (" 20" ));
1869- EXPECT_THAT (Eval (" ::Vars::Nested::static_const" ), XFail ( IsEqual (" 30" ) ));
1870- EXPECT_THAT (Eval (" Vars::Nested::static_const" ), XFail ( IsEqual (" 30" ) ));
1869+ EXPECT_THAT (Eval (" ::Vars::Nested::static_const" ), IsEqual (" 30" ));
1870+ EXPECT_THAT (Eval (" Vars::Nested::static_const" ), IsEqual (" 30" ));
18711871}
18721872
18731873#ifndef __EMSCRIPTEN__
@@ -2069,8 +2069,8 @@ TEST_F(EvalTest, TestTemplateTypes) {
20692069 EXPECT_THAT (
20702070 Eval (" ns::T_1<ns::T_1<int> >::cx" ),
20712071 IsError (" use of undeclared identifier 'ns::T_1<ns::T_1<int> >::cx'" ));
2072- EXPECT_THAT (Eval (" T_1<int>::cx" ), XFail ( IsEqual (" 24" ) ));
2073- EXPECT_THAT (Eval (" T_1<double>::cx" ), XFail ( IsEqual (" 42" ) ));
2072+ EXPECT_THAT (Eval (" T_1<int>::cx" ), IsEqual (" 24" ));
2073+ EXPECT_THAT (Eval (" T_1<double>::cx" ), IsEqual (" 42" ));
20742074 EXPECT_THAT (Eval (" ns::T_1<int>::cx" ), IsEqual (" 64" ));
20752075
20762076 for (std::string arg : {" int" , " int*" , " int**" , " int&" , " int*&" }) {
@@ -2114,7 +2114,7 @@ TEST_F(EvalTest, TestTemplateCpp11) {
21142114 EXPECT_THAT (Eval (" T_1<2>>1" ),
21152115 IsError (" <expr:1:7>: Unexpected token: <'>' (greater)>" ));
21162116 // And here it's a template.
2117- EXPECT_THAT (Eval (" T_1<int>::cx + 1" ), XFail ( IsEqual (" 25" ) ));
2117+ EXPECT_THAT (Eval (" T_1<int>::cx + 1" ), IsEqual (" 25" ));
21182118}
21192119
21202120TEST_F (EvalTest, TestTemplateWithNumericArguments) {
0 commit comments