LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libcxx: Fix path.compare.pass expected result

Browse Source 
The expected 'filesystem::path::compare' result states that for different
path only result sign contains the information about passed arguments
(not its integer value).  This is due it uses the output of other compare
functions (basic_string_view and char_traits) without further handling and
char_traits uses memcmp for final buffer comparison.

However for GLIBC on AArch64 the code:

  int ret = memcmp ("b/a/c", "a/b/c", 1);

Results in '64' where for x86_64 it results in '1'.

This patch fixes the expected 'filesystem::path::compare' by normalizing
all the results before assert comparison.


git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@278745 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Adhemerval Zanella
2016-08-15 21:24:50 +00:00
parent c2141dfff2
commit ea714e73a6
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
test/std/experimental/filesystem/class.path/path.member/path.compare.pass.cpp
View File

@@ -73,6 +73,11 @@ const PathCompareTest CompareTestCases[] =
#undef LONGC #undef LONGC
#undef LONGD #undef LONGD
static inline int normalize_ret(int ret)
{
return ret < 0 ? -1 : (ret > 0 ? 1 : 0);
}
int main() int main()
{ {
using namespace fs; using namespace fs;
@@ -86,13 +91,12 @@ int main()
DisableAllocationGuard g; // none of these operations should allocate DisableAllocationGuard g; // none of these operations should allocate
// check runtime results // check runtime results
int ret1 = p1.compare(p2); int ret1 = normalize_ret(p1.compare(p2));
int ret2 = p1.compare(R); int ret2 = normalize_ret(p1.compare(R));
int ret3 = p1.compare(TC.RHS); int ret3 = normalize_ret(p1.compare(TC.RHS));
int ret4 = p1.compare(RV); int ret4 = normalize_ret(p1.compare(RV));
assert(ret1 == ret2 && ret1 == ret3 && ret1 == ret4); assert(ret1 == ret2 && ret1 == ret3 && ret1 == ret4);
int normalized_ret = ret1 < 0 ? -1 : (ret1 > 0 ? 1 : 0); assert(ret1 == E);
assert(normalized_ret == E);
// check signatures // check signatures
ASSERT_NOEXCEPT(p1.compare(p2)); ASSERT_NOEXCEPT(p1.compare(p2));