From 400a08e28429f2c56c2298908be673a5951d5e20 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Thu, 24 Jan 2019 15:39:19 +0000 Subject: [PATCH] Fix failing test due to inconsistent strcmp results * testsuite/27_io/filesystem/path/compare/strings.cc: Only compare sign of results. From-SVN: r268238 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/testsuite/27_io/filesystem/path/compare/strings.cc | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4fd9fee..dd27078 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2019-01-24 Jonathan Wakely + + * testsuite/27_io/filesystem/path/compare/strings.cc: Only compare + sign of results. + 2019-01-22 Jonathan Wakely PR libstdc++/88740 diff --git a/libstdc++-v3/testsuite/27_io/filesystem/path/compare/strings.cc b/libstdc++-v3/testsuite/27_io/filesystem/path/compare/strings.cc index 3f0aa4b..83487ae 100644 --- a/libstdc++-v3/testsuite/27_io/filesystem/path/compare/strings.cc +++ b/libstdc++-v3/testsuite/27_io/filesystem/path/compare/strings.cc @@ -26,6 +26,8 @@ using std::filesystem::path; +int sign(int i) { return i > 0 ? 1 : i < 0 ? -1 : 0; } + void test01() { @@ -36,8 +38,8 @@ test01() path p(s); VERIFY( p.compare(s) == 0 ); VERIFY( p.compare(s.c_str()) == 0 ); - VERIFY( p.compare(p0) == p.compare(s0) ); - VERIFY( p.compare(p0) == p.compare(s0.c_str()) ); + VERIFY( sign(p.compare(p0)) == sign(p.compare(s0)) ); + VERIFY( sign(p.compare(p0)) == sign(p.compare(s0.c_str())) ); } } -- 2.7.4