From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1059) id 63E4B389247E; Thu, 25 Jun 2020 14:39:38 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 63E4B389247E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1593095978; bh=L3B1cQjOblp48sxhnMrtvyiXLOjZz5mgYbEpjlHCVZM=; h=From:To:Subject:Date:From; b=WIZkY0rP8wr7ivB1qArOszaWSwvKH2ZM8bdRkNHQX4mAoBkxwIL8911b5BlLrn5T+ p2LdA+1CtR7QE2NxZ6Hc88/mWAT8VhsQCljzKuVnW2ESQL0bgo9HV4+qzlH0QtmfM9 QhOsVmKvfKpj6kVIvXaQ70R/JJ0fuID9MnRzmfNs= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Nathan Sidwell To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc/devel/c++-modules] libstdc++: Improve tests for std::atomic_flag X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/devel/c++-modules X-Git-Oldrev: 17412a74c531a21595311df5428f26552e82dfa8 X-Git-Newrev: e784f98027dbd5cdc46712751dcfba8278eb7fa9 Message-Id: <20200625143938.63E4B389247E@sourceware.org> Date: Thu, 25 Jun 2020 14:39:38 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jun 2020 14:39:38 -0000 https://gcc.gnu.org/g:e784f98027dbd5cdc46712751dcfba8278eb7fa9 commit e784f98027dbd5cdc46712751dcfba8278eb7fa9 Author: Jonathan Wakely Date: Fri Jun 12 10:33:37 2020 +0100 libstdc++: Improve tests for std::atomic_flag The tests for clear() and test_and_set() didn't cover all cases. * testsuite/29_atomics/atomic_flag/clear/1.cc: Also test clear() when the value is currently set. * testsuite/29_atomics/atomic_flag/test_and_set/explicit.cc: Actually check the return value. * testsuite/29_atomics/atomic_flag/test_and_set/implicit.cc: Likewise. Diff: --- libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc | 8 ++++---- .../testsuite/29_atomics/atomic_flag/test_and_set/explicit.cc | 7 +++---- .../testsuite/29_atomics/atomic_flag/test_and_set/implicit.cc | 7 +++---- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc index 30d9075e372..ed5d11a5292 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/clear/1.cc @@ -25,9 +25,9 @@ int main() { std::atomic_flag f = ATOMIC_FLAG_INIT; - f.clear(); // set to false + f.clear(); // set to false + VERIFY( false == f.test_and_set() ); // return true + VERIFY( true == f.test_and_set() ); // return true + f.clear(); // set to false VERIFY( false == f.test_and_set() ); // return previous false, set to true - VERIFY( true == f.test_and_set() ); // return true - - return 0; } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit.cc index 5d6dbcc98a2..1934854d7f7 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/explicit.cc @@ -19,14 +19,13 @@ // . #include +#include int main() { using namespace std; atomic_flag af = ATOMIC_FLAG_INIT; - if (!af.test_and_set(memory_order_acquire)) - af.clear(memory_order_release); - - return 0; + VERIFY( ! af.test_and_set(memory_order_acquire) ); + VERIFY( af.test_and_set(memory_order_acquire) ); } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/implicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/implicit.cc index 8e1284cd299..1934854d7f7 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/implicit.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test_and_set/implicit.cc @@ -19,14 +19,13 @@ // . #include +#include int main() { using namespace std; atomic_flag af = ATOMIC_FLAG_INIT; - if (!af.test_and_set()) - af.clear(); - - return 0; + VERIFY( ! af.test_and_set(memory_order_acquire) ); + VERIFY( af.test_and_set(memory_order_acquire) ); }