From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 3AAFD3857C51; Fri, 2 Feb 2024 10:27:39 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3AAFD3857C51 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1706869659; bh=xo3Ve1UaF7aEA/Nm3U3CxR5jTVYWY3iAIwy4i5P4g5w=; h=From:To:Subject:Date:From; b=KT2v0iLDCqBYsPuqDf6zpBUaKPKkSKQ5xI1Amd/Um/m3plf8niqs79ER8qfaUXW6X xe9GiC2r2xd30cO+PqefNAO0iuN+Fe0fiUkNUSoHMSBi5zb/Jakkh31BKquvRyRYIq yEXdZC79zvHAYLho3V9w7RMT7j8Oaa8yadRN2//0= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r14-8744] libstdc++: Fix invalid order in PSTL inplace_merge test [PR90276] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 723a7c1ad29523b9ddff53c7b147bffea56fbb63 X-Git-Newrev: a6286584e5536d1853a851b8c2ac3196956e3068 Message-Id: <20240202102739.3AAFD3857C51@sourceware.org> Date: Fri, 2 Feb 2024 10:27:39 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a6286584e5536d1853a851b8c2ac3196956e3068 commit r14-8744-ga6286584e5536d1853a851b8c2ac3196956e3068 Author: Jonathan Wakely Date: Thu Feb 1 10:06:15 2024 +0000 libstdc++: Fix invalid order in PSTL inplace_merge test [PR90276] This looks like a typo in the upstream test that causes a failure in debug mode. It has been reported upstream. libstdc++-v3/ChangeLog: PR libstdc++/90276 * testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc: Fix comparison function to use less-than instead of equality. Diff: --- libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc index 576f22423b88..a9205553574a 100644 --- a/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc +++ b/libstdc++-v3/testsuite/25_algorithms/pstl/alg_merge/inplace_merge.cc @@ -160,7 +160,7 @@ main() test_by_type( [](std::size_t idx){ return MemoryChecker{std::int32_t(idx * 2)}; }, [](std::size_t idx){ return MemoryChecker{std::int32_t(idx * 2 + 1)}; }, - [](const MemoryChecker& val1, const MemoryChecker& val2){ return val1.value() == val2.value(); }); + [](const MemoryChecker& val1, const MemoryChecker& val2){ return val1.value() < val2.value(); }); EXPECT_FALSE(MemoryChecker::alive_objects() < 0, "wrong effect from inplace_merge: number of ctors calls < num of dtors calls"); EXPECT_FALSE(MemoryChecker::alive_objects() > 0, "wrong effect from inplace_merge: number of ctors calls > num of dtors calls");