From: khizmax Date: Mon, 24 Apr 2017 16:11:45 +0000 (+0300) Subject: Removed prohibited atomic::fetch_xxx() tests X-Git-Tag: v2.3.0~58 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=05cc193f98f6fdbb2964feb0f23dc27ac4af5821;p=libcds.git Removed prohibited atomic::fetch_xxx() tests --- diff --git a/test/unit/misc/cxx11_atomic_class.cpp b/test/unit/misc/cxx11_atomic_class.cpp index a07401c9..6912ae7f 100644 --- a/test/unit/misc/cxx11_atomic_class.cpp +++ b/test/unit/misc/cxx11_atomic_class.cpp @@ -452,18 +452,6 @@ namespace { EXPECT_EQ( reinterpret_cast(a.exchange( (void *) arr, order )), arr + 3 ); EXPECT_EQ( reinterpret_cast(a.load( oLoad )), arr ); EXPECT_EQ( *reinterpret_cast(a.load( oLoad )), 1 ); - - for ( char i = 1; i < aSize; ++i ) { - EXPECT_EQ( *reinterpret_cast(a.load( oLoad )), i ); - a.fetch_add( 1, order ); - EXPECT_EQ( *reinterpret_cast(a.load( oLoad )), i + 1 ); - } - - for ( char i = aSize; i > 1; --i ) { - EXPECT_EQ( *reinterpret_cast(a.load( oLoad )), i ); - a.fetch_sub( 1, order ); - EXPECT_EQ( *reinterpret_cast(a.load( oLoad )), i - 1 ); - } } template @@ -498,18 +486,6 @@ namespace { EXPECT_EQ( reinterpret_cast( a.load()), arr ); EXPECT_EQ( *reinterpret_cast( a.load()), 1 ); - for ( char i = 1; i < aSize; ++i ) { - EXPECT_EQ( *reinterpret_cast(a.load()), i ); - a.fetch_add( 1 ); - EXPECT_EQ( *reinterpret_cast(a.load()), i + 1 ); - } - - for ( char i = aSize; i > 1; --i ) { - EXPECT_EQ( *reinterpret_cast(a.load()), i ); - a.fetch_sub( 1 ); - EXPECT_EQ( *reinterpret_cast(a.load()), i - 1 ); - } - do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_relaxed ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_acquire ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_release ); @@ -788,8 +764,6 @@ namespace { test_atomic_integral_volatile(); } -#if !( CDS_COMPILER == CDS_COMPILER_CLANG && CDS_COMPILER_VERSION < 50000 ) - //clang error with atomic fetch_add/fetch_sub TEST_F( cxx11_atomic_class, atomic_pointer_void ) { do_test_atomic_pointer_void(); @@ -799,7 +773,6 @@ namespace { { do_test_atomic_pointer_void(); } -#endif TEST_F( cxx11_atomic_class, atomic_pointer_char ) { diff --git a/test/unit/misc/cxx11_atomic_func.cpp b/test/unit/misc/cxx11_atomic_func.cpp index f7c348b5..17eac5c1 100644 --- a/test/unit/misc/cxx11_atomic_func.cpp +++ b/test/unit/misc/cxx11_atomic_func.cpp @@ -513,18 +513,6 @@ namespace misc { EXPECT_EQ( reinterpret_cast(atomics::atomic_exchange_explicit( &a, (void *) arr, order )), arr + 3 ); EXPECT_EQ( reinterpret_cast(atomics::atomic_load_explicit( &a, oLoad )), arr ); EXPECT_EQ( *reinterpret_cast(atomics::atomic_load_explicit( &a, oLoad )), 1 ); - - for ( char i = 1; i < aSize; ++i ) { - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load_explicit( &a, oLoad )), i ); - atomics::atomic_fetch_add_explicit( &a, 1, order ); - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load_explicit( &a, oLoad )), i + 1 ); - } - - for ( char i = aSize; i > 1; --i ) { - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load_explicit( &a, oLoad )), i ); - atomics::atomic_fetch_sub_explicit( &a, 1, order ); - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load_explicit( &a, oLoad )), i - 1 ); - } } template @@ -559,18 +547,6 @@ namespace misc { EXPECT_EQ( reinterpret_cast( atomics::atomic_load( &a )), arr ); EXPECT_EQ( *reinterpret_cast(atomics::atomic_load( &a )), 1 ); - for ( char i = 1; i < aSize; ++i ) { - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load( &a )), i ); - atomics::atomic_fetch_add( &a, 1 ); - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load( &a )), i + 1 ); - } - - for ( char i = aSize; i > 1; --i ) { - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load( &a )), i ); - atomics::atomic_fetch_sub( &a, 1 ); - EXPECT_EQ( *reinterpret_cast(atomics::atomic_load( &a )), i - 1 ); - } - do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_relaxed ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_acquire ); do_test_atomic_pointer_void_( a, arr, aSize, atomics::memory_order_release ); @@ -706,8 +682,6 @@ namespace misc { test_atomic_integral_volatile(); } -#if !( CDS_COMPILER == CDS_COMPILER_CLANG && CDS_COMPILER_VERSION < 50000 ) - //clang error with atomic fetch_add/fetch_sub TEST_F( cxx11_atomic_func, atomic_pointer_void ) { do_test_atomic_pointer_void(); @@ -716,7 +690,6 @@ namespace misc { { do_test_atomic_pointer_void(); } -#endif TEST_F( cxx11_atomic_func, atomic_pointer_char ) {