diff options
| author | Carlos O'Donell <carlos@redhat.com> | 2016-12-23 13:46:56 -0500 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2016-12-23 13:46:56 -0500 |
| commit | 81e0662e5f2c342ffa413826b7b100d56677b613 (patch) | |
| tree | 35dd21027a51c1714a57fb479809c0f36a071b68 /nptl | |
| parent | b0a679f4fd5363809a972b697e8a0b1fc66fcbb1 (diff) | |
| download | glibc-81e0662e5f2c342ffa413826b7b100d56677b613.tar.gz | |
Fix failing pretty printer tests when CPPFLAGS has optimizations.
The value of CPPFLAGS provided by the environment may have optimizations
that interfere with the pretty printer test requirements. To override
such optimizations the pretty printer tests must also specify CPPFLAGS.
The existing pretty printer tests are fixed and the
README.pretty-printers is updated with the new requirement.
Diffstat (limited to 'nptl')
| -rw-r--r-- | nptl/Makefile | 10 | ||||
| -rw-r--r-- | nptl/test-condattr-printers.c | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 7ac9196975..bed5babfd9 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -318,12 +318,22 @@ tests-printers := test-mutexattr-printers test-mutex-printers \ test-condattr-printers test-cond-printers \ test-rwlockattr-printers test-rwlock-printers +# We must specify both CFLAGS and CPPFLAGS to override any +# compiler options the user might have provided that conflict +# with what we need e.g. user specifies CPPFLAGS with -O2 and +# we need -O0. CFLAGS-test-mutexattr-printers.c := $(CFLAGS-printers-tests) CFLAGS-test-mutex-printers.c := $(CFLAGS-printers-tests) CFLAGS-test-condattr-printers.c := $(CFLAGS-printers-tests) CFLAGS-test-cond-printers.c := $(CFLAGS-printers-tests) CFLAGS-test-rwlockattr-printers.c := $(CFLAGS-printers-tests) CFLAGS-test-rwlock-printers.c := $(CFLAGS-printers-tests) +CPPFLAGS-test-mutexattr-printers.c := $(CFLAGS-printers-tests) +CPPFLAGS-test-mutex-printers.c := $(CFLAGS-printers-tests) +CPPFLAGS-test-condattr-printers.c := $(CFLAGS-printers-tests) +CPPFLAGS-test-cond-printers.c := $(CFLAGS-printers-tests) +CPPFLAGS-test-rwlockattr-printers.c := $(CFLAGS-printers-tests) +CPPFLAGS-test-rwlock-printers.c := $(CFLAGS-printers-tests) ifeq ($(build-shared),yes) tests-printers-libs := $(shared-thread-library) diff --git a/nptl/test-condattr-printers.c b/nptl/test-condattr-printers.c index 4db4098827..2815d02101 100644 --- a/nptl/test-condattr-printers.c +++ b/nptl/test-condattr-printers.c @@ -66,6 +66,7 @@ condvar_reinit (pthread_cond_t *condvar, const pthread_condattr_t *attr) } /* Tests setting the clock ID attribute. */ +__attribute__ ((noinline)) static int test_setclock (pthread_cond_t *condvar, pthread_condattr_t *attr) { |