diff options
author | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-12-12 16:20:49 +0000 |
---|---|---|
committer | redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-12-12 16:20:49 +0000 |
commit | 441e784d01d8ff44b20b3f0aa5a3de5d9d924cbe (patch) | |
tree | 61bb3fc7746c84ce8a9ff76c6c444254b631affd | |
parent | a7d8f2570b7af4f20cce983ce4d072976dc9bd16 (diff) | |
download | gcc-441e784d01d8ff44b20b3f0aa5a3de5d9d924cbe.tar.gz |
PR78465 Remove runtime tests for <atomic> macros
PR libstdc++/78465
* testsuite/29_atomics/headers/atomic/macros.cc: Replace runtime tests
with preprocessor conditions.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-6-branch@243561 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | libstdc++-v3/ChangeLog | 9 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc | 68 |
2 files changed, 29 insertions, 48 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bd46d6905f2..99d248721fe 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,6 +1,15 @@ 2016-12-12 Jonathan Wakely <jwakely@redhat.com> Backport from mainline + 2016-11-22 Jonathan Wakely <jwakely@redhat.com> + + PR libstdc++/78465 + * testsuite/29_atomics/headers/atomic/macros.cc: Replace runtime tests + with preprocessor conditions. + +2016-12-12 Jonathan Wakely <jwakely@redhat.com> + + Backport from mainline 2016-10-19 Jonathan Wakely <jwakely@redhat.com> * include/experimental/bits/shared_ptr.h (experimental::shared_ptr): diff --git a/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc b/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc index a53e26b2ad4..4cb3e1ae988 100644 --- a/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc +++ b/libstdc++-v3/testsuite/29_atomics/headers/atomic/macros.cc @@ -1,5 +1,4 @@ -// { dg-options "-std=gnu++11" } -// { dg-do compile } +// { dg-do preprocess { target c++11 } } // Copyright (C) 2008-2016 Free Software Foundation, Inc. // @@ -22,42 +21,61 @@ #ifndef ATOMIC_BOOL_LOCK_FREE # error "ATOMIC_BOOL_LOCK_FREE must be a macro" +#elif ATOMIC_BOOL_LOCK_FREE != 1 && ATOMIC_BOOL_LOCK_FREE != 2 +# error "ATOMIC_BOOL_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_CHAR_LOCK_FREE # error "ATOMIC_CHAR_LOCK_FREE must be a macro" +#elif ATOMIC_CHAR_LOCK_FREE != 1 && ATOMIC_CHAR_LOCK_FREE != 2 +# error "ATOMIC_CHAR_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_CHAR16_T_LOCK_FREE # error "ATOMIC_CHAR16_T_LOCK_FREE must be a macro" +#elif ATOMIC_CHAR16_T_LOCK_FREE != 1 && ATOMIC_CHAR16_T_LOCK_FREE != 2 #endif #ifndef ATOMIC_CHAR32_T_LOCK_FREE # error "ATOMIC_CHAR32_T_LOCK_FREE must be a macro" +#elif ATOMIC_CHAR32_T_LOCK_FREE != 1 && ATOMIC_CHAR32_T_LOCK_FREE != 2 +# error "ATOMIC_CHAR32_T_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_WCHAR_T_LOCK_FREE # error "ATOMIC_WCHAR_T_LOCK_FREE must be a macro" +#elif ATOMIC_WCHAR_T_LOCK_FREE != 1 && ATOMIC_WCHAR_T_LOCK_FREE != 2 +# error "ATOMIC_WCHAR_T_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_SHORT_LOCK_FREE # error "ATOMIC_SHORT_LOCK_FREE must be a macro" +#elif ATOMIC_SHORT_LOCK_FREE != 1 && ATOMIC_SHORT_LOCK_FREE != 2 +# error "ATOMIC_SHORT_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_INT_LOCK_FREE # error "ATOMIC_INT_LOCK_FREE must be a macro" +#elif ATOMIC_INT_LOCK_FREE != 1 && ATOMIC_INT_LOCK_FREE != 2 +# error "ATOMIC_INT_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_LONG_LOCK_FREE # error "ATOMIC_LONG_LOCK_FREE must be a macro" +#elif ATOMIC_LONG_LOCK_FREE != 1 && ATOMIC_LONG_LOCK_FREE != 2 +# error "ATOMIC_LONG_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_LLONG_LOCK_FREE # error "ATOMIC_LLONG_LOCK_FREE must be a macro" +#elif ATOMIC_LLONG_LOCK_FREE != 1 && ATOMIC_LLONG_LOCK_FREE != 2 +# error "ATOMIC_LLONG_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_POINTER_LOCK_FREE # error "ATOMIC_POINTER_LOCK_FREE must be a macro" +#elif ATOMIC_POINTER_LOCK_FREE != 1 && ATOMIC_POINTER_LOCK_FREE != 2 +# error "ATOMIC_POINTER_LOCK_FREE must be 1 or 2" #endif #ifndef ATOMIC_FLAG_INIT @@ -67,49 +85,3 @@ #ifndef ATOMIC_VAR_INIT #error "ATOMIC_VAR_INIT_must_be_a_macro" #endif - - -extern void abort(void); - -int main () -{ -#if (ATOMIC_BOOL_LOCK_FREE != 1 && ATOMIC_BOOL_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_CHAR_LOCK_FREE != 1 && ATOMIC_CHAR_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_CHAR16_T_LOCK_FREE != 1 && ATOMIC_CHAR16_T_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_CHAR32_T_LOCK_FREE != 1 && ATOMIC_CHAR32_T_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_WCHAR_T_LOCK_FREE != 1 && ATOMIC_WCHAR_T_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_SHORT_LOCK_FREE != 1 && ATOMIC_SHORT_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_INT_LOCK_FREE != 1 && ATOMIC_INT_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_LONG_LOCK_FREE != 1 && ATOMIC_LONG_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_LLONG_LOCK_FREE != 1 && ATOMIC_LLONG_LOCK_FREE != 2) - abort (); -#endif - -#if (ATOMIC_POINTER_LOCK_FREE != 1 && ATOMIC_POINTER_LOCK_FREE != 2) - abort (); -#endif -} |