Index: libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp =================================================================== --- libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp +++ libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp @@ -46,9 +46,11 @@ , {S("p1/"), S("p2"), S("p1/p2")} , {S("p1"), S("/p2"), S("/p2")} , {S("p1/"), S("/p2"), S("/p2")} +#ifndef _WIN32 , {S("p1"), S("\\p2"), S("p1/\\p2")} , {S("p1\\"), S("p2"), S("p1\\/p2")} , {S("p1\\"), S("\\p2"), S("p1\\/\\p2")} +#endif , {S(""), S("p2"), S("p2")} , {S("/p1"), S("p2"), S("/p1/p2")} , {S("/p1"), S("/p2"), S("/p2")} @@ -107,7 +109,7 @@ DisableAllocationGuard g; LHS /= RHS; } - assert(PathEq(LHS, E)); + assert(LHS == E); } // basic_string_view { @@ -117,7 +119,7 @@ DisableAllocationGuard g; LHS /= RHS; } - assert(PathEq(LHS, E)); + assert(LHS == E); } // CharT* { @@ -127,7 +129,7 @@ DisableAllocationGuard g; LHS /= RHS; } - assert(PathEq(LHS, E)); + assert(LHS == E); } { path LHS(L); PathReserve(LHS, ReserveSize); @@ -136,7 +138,7 @@ DisableAllocationGuard g; LHS.append(RHS, StrEnd(RHS)); } - assert(PathEq(LHS, E)); + assert(LHS == E); } // input iterator - For non-native char types, appends needs to copy the // iterator range into a contiguous block of memory before it can perform the @@ -152,7 +154,7 @@ if (DisableAllocations) g.requireExactly(0); LHS /= RHS; } - assert(PathEq(LHS, E)); + assert(LHS == E); } { path LHS(L); PathReserve(LHS, ReserveSize); @@ -163,7 +165,7 @@ if (DisableAllocations) g.requireExactly(0); LHS.append(RHS, REnd); } - assert(PathEq(LHS, E)); + assert(LHS == E); } } @@ -190,7 +192,7 @@ path LHS(L); Str RHS(R); path& Ref = LHS.append(RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } // basic_string_view @@ -198,14 +200,14 @@ path LHS(L); StrView RHS(R); path& Ref = (LHS /= RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } { path LHS(L); StrView RHS(R); path& Ref = LHS.append(RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } // Char* @@ -213,21 +215,21 @@ path LHS(L); Str RHS(R); path& Ref = (LHS /= RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } { path LHS(L); Ptr RHS(R); path& Ref = LHS.append(RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } { path LHS(L); Ptr RHS(R); path& Ref = LHS.append(RHS, StrEnd(RHS)); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } // iterators @@ -235,13 +237,13 @@ path LHS(L); InputIter RHS(R); path& Ref = (LHS /= RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } { path LHS(L); InputIter RHS(R); path& Ref = LHS.append(RHS); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } { @@ -249,7 +251,7 @@ InputIter RHS(R); InputIter REnd(StrEnd(R)); path& Ref = LHS.append(RHS, REnd); - assert(PathEq(LHS, E)); + assert(LHS == E); assert(&Ref == &LHS); } } @@ -318,7 +320,7 @@ path LHS(LHS_In); path RHS(RHS_In); path& Res = (LHS /= RHS); - assert(PathEq(Res, (const char*)TC.expect)); + assert(Res == (const char*)TC.expect); assert(&Res == &LHS); } doAppendSourceTest (TC);