Skip to content

Commit

Permalink
libcxx: Fix path.compare.pass expected result
Browse files Browse the repository at this point in the history
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.

llvm-svn: 278745
  • Loading branch information
zatrazz committed Aug 15, 2016
1 parent 28fdc42 commit ced7928
Showing 1 changed file with 10 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ const PathCompareTest CompareTestCases[] =
#undef LONGC
#undef LONGD

static inline int normalize_ret(int ret)
{
return ret < 0 ? -1 : (ret > 0 ? 1 : 0);
}

int main()
{
using namespace fs;
Expand All @@ -86,13 +91,12 @@ int main()
DisableAllocationGuard g; // none of these operations should allocate

// check runtime results
int ret1 = p1.compare(p2);
int ret2 = p1.compare(R);
int ret3 = p1.compare(TC.RHS);
int ret4 = p1.compare(RV);
int ret1 = normalize_ret(p1.compare(p2));
int ret2 = normalize_ret(p1.compare(R));
int ret3 = normalize_ret(p1.compare(TC.RHS));
int ret4 = normalize_ret(p1.compare(RV));
assert(ret1 == ret2 && ret1 == ret3 && ret1 == ret4);
int normalized_ret = ret1 < 0 ? -1 : (ret1 > 0 ? 1 : 0);
assert(normalized_ret == E);
assert(ret1 == E);

// check signatures
ASSERT_NOEXCEPT(p1.compare(p2));
Expand Down

0 comments on commit ced7928

Please sign in to comment.