2014-02-21 Joseph Myers <joseph@codesourcery.com>
+ * Makefile ($(objpfx)c++-types-check.out): Use $(evaluate-test).
+ ($(objpfx)check-local-headers.out): Likewise.
+ ($(objpfx)begin-end-check.out): Likewise.
+ * Makerules (check-abi-%.out): Likewise.
+ * catgets/Makefile ($(objpfx)test1.cat): Likewise.
+ ($(objpfx)test2.cat): Likewise.
+ ($(objpfx)de/libc.cat): Likewise.
+ ($(objpfx)test-gencat.out): Likewise.
+ * conform/Makefile ($(objpfx)run-conformtest.out): Likewise.
+ * elf/Makefile ($(objpfx)order-cmp.out): Likewise.
+ ($(objpfx)noload-mem): Likewise.
+ ($(objpfx)tst-pathopt.out): Likewise.
+ ($(objpfx)tst-rtld-load-self.out): Likewise.
+ ($(objpfx)tst-array1-cmp.out): Likewise.
+ ($(objpfx)tst-array1-static-cmp.out): Likewise.
+ ($(objpfx)tst-array2-cmp.out): Likewise.
+ ($(objpfx)tst-array3-cmp.out): Likewise.
+ ($(objpfx)tst-array4-cmp.out): Likewise.
+ ($(objpfx)tst-array5-cmp.out): Likewise.
+ ($(objpfx)tst-array5-static-cmp.out): Likewise.
+ ($(objpfx)check-textrel.out): Likewise.
+ ($(objpfx)check-execstack.out): Likewise.
+ ($(objpfx)check-localplt.out): Likewise.
+ ($(objpfx)order2-cmp.out): Likewise.
+ ($(objpfx)tst-leaks1-mem): Likewise.
+ ($(objpfx)tst-leaks1-static-mem): Likewise.
+ ($(objpfx)tst-initorder-cmp.out): Likewise.
+ ($(objpfx)tst-initorder2-cmp.out): Likewise.
+ ($(objpfx)tst-unused-dep.out): Likewise.
+ ($(objpfx)tst-unused-dep-cmp.out): Likewise.
+ * grp/Makefile ($(objpfx)tst_fgetgrent.out): Likewise.
+ * iconv/Makefile (test-iconvconfig): Likewise.
+ * iconvdata/Makefile ($(objpfx)mtrace-tst-loading): Likewise.
+ ($(objpfx)iconv-test.out): Likewise.
+ ($(objpfx)tst-tables.out): Likewise.
+ * intl/Makefile ($(objpfx)mtrace-tst-gettext): Likewise.
+ ($(objpfx)tst-gettext.out): Likewise.
+ ($(objpfx)tst-translit.out): Likewise.
+ ($(objpfx)tst-gettext2.out): Likewise.
+ ($(objpfx)tst-gettext4.out): Likewise.
+ ($(objpfx)tst-gettext6.out): Likewise.
+ * io/Makefile ($(objpfx)ftwtest.out): Likewise.
+ * libio/Makefile ($(objpfx)test-freopen.out): Likewise.
+ ($(objpfx)tst-fopenloc-cmp.out): Likewise.
+ ($(objpfx)tst-fopenloc-mem.out): Likewise.
+ * malloc/Makefile ($(objpfx)tst-mtrace.out): Likewise.
+ * misc/Makefile ($(objpfx)tst-error1-mem): Likewise.
+ * posix/Makefile ($(objpfx)globtest.out): Likewise.
+ ($(objpfx)wordexp-tst.out): Likewise.
+ ($(objpfx)annexc.out): Likewise.
+ ($(objpfx)tst-fnmatch-mem): Likewise.
+ ($(objpfx)bug-regex2-mem): Likewise.
+ ($(objpfx)bug-regex14-mem): Likewise.
+ ($(objpfx)bug-regex21-mem): Likewise.
+ ($(objpfx)bug-regex31-mem): Likewise.
+ ($(objpfx)tst-vfork3-mem): Likewise.
+ ($(objpfx)tst-rxspencer-no-utf8-mem): Likewise.
+ ($(objpfx)tst-pcre-mem): Likewise.
+ ($(objpfx)tst-boost-mem): Likewise.
+ ($(objpfx)tst-getconf.out): Likewise.
+ ($(objpfx)bug-ga2-mem): Likewise.
+ ($(objpfx)bug-glob2-mem): Likewise.
+ * resolv/Makefile ($(objpfx)mtrace-tst-leaks): Likewise.
+ ($(objpfx)mtrace-tst-leaks2): Likewise.
+ * stdio-common/Makefile ($(objpfx)tst-unbputc.out): Likewise.
+ ($(objpfx)tst-printf.out): Likewise.
+ ($(objpfx)tst-setvbuf1.out): Likewise.
+ ($(objpfx)tst-setvbuf1-cmp.out): Likewise.
+ * stdlib/Makefile ($(objpfx)isomac.out): Likewise.
+ ($(objpfx)tst-fmtmsg.out): Likewise.
+ * string/Makefile ($(objpfx)tst-svc-cmp.out): Likewise.
+ * sysdeps/x86/Makefile ($(objpfx)tst-xmmymm.out): Likewise.
+
* bits/fcntl.h [__USE_MISC]: Remove redundant conditionals.
* bits/sigaction.h [__USE_MISC]: Likewise.
* bits/waitstatus.h: Update #endif comments.
vpath c++-types.data $(+sysdep_dirs)
$(objpfx)c++-types-check.out: c++-types.data scripts/check-c++-types.sh
- scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@
+ scripts/check-c++-types.sh $< $(CXX) $(filter-out -std=gnu99 -Wstrict-prototypes,$(CFLAGS)) $(CPPFLAGS) > $@; \
+ $(evaluate-test)
endif
$(objpfx)check-local-headers.out: scripts/check-local-headers.sh
AWK='$(AWK)' scripts/check-local-headers.sh \
- "$(includedir)" "$(objpfx)" > $@
+ "$(includedir)" "$(objpfx)" > $@; \
+ $(evaluate-test)
ifneq ($(PERL),no)
installed-headers = argp/argp.h assert/assert.h catgets/nl_types.h \
tests: $(objpfx)begin-end-check.out
$(objpfx)begin-end-check.out: scripts/begin-end-check.pl
- $(PERL) scripts/begin-end-check.pl $(installed-headers) > $@
+ $(PERL) scripts/begin-end-check.pl $(installed-headers) > $@; \
+ $(evaluate-test)
endif
# The realclean target is just like distclean for the parent, but we want
ifdef abilist-pattern
$(objpfx)check-abi-%.out: $(common-objpfx)config.make $(abilist-pattern) \
$(objpfx)%.symlist
- $(check-abi-pattern)
+ $(check-abi-pattern); \
+ $(evaluate-test)
$(objpfx)check-abi-%.out: $(common-objpfx)config.make $(abilist-pattern) \
$(common-objpfx)%.symlist
- $(check-abi-pattern)
+ $(check-abi-pattern); \
+ $(evaluate-test)
endif
$(objpfx)check-abi-%.out: $(common-objpfx)config.make %.abilist \
$(objpfx)%.symlist
- $(check-abi)
+ $(check-abi); \
+ $(evaluate-test)
$(objpfx)check-abi-%.out: $(common-objpfx)config.make %.abilist \
$(common-objpfx)%.symlist
- $(check-abi)
+ $(check-abi); \
+ $(evaluate-test)
define check-abi-pattern
diff -p -U 0 $(filter $(abilist-pattern),$^) $(filter %.symlist,$^) \
> $@
$(objpfx)test1.cat: test1.msg $(objpfx)gencat
LC_ALL=hr_HR.ISO-8859-2 LOCPATH=$(common-objpfx)localedata \
GCONV_PATH=$(common-objpfx)iconvdata \
- $(built-program-cmd) -H $(objpfx)test1.h $@ $<
+ $(built-program-cmd) -H $(objpfx)test1.h $@ $<; \
+ $(evaluate-test)
$(objpfx)test2.cat: test2.msg $(objpfx)gencat
LOCPATH=$(common-objpfx)localedata \
GCONV_PATH=$(common-objpfx)iconvdata \
- $(built-program-cmd) -H $(objpfx)test2.h $@ $<
+ $(built-program-cmd) -H $(objpfx)test2.h $@ $<; \
+ $(evaluate-test)
$(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat
$(make-target-directory)
LC_ALL=de_DE.ISO-8859-1 LOCPATH=$(common-objpfx)localedata \
- GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $<
+ GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $<; \
+ $(evaluate-test)
$(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
# Generate a non-simple input file.
$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
$(objpfx)sample.SJIS.cat
- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
+ $(evaluate-test)
$(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
$(wildcard data/*.h-data) \
$(wildcard data/*/*.h-data)
-$(BASH) -e $< $(objpfx) $(PERL) '$(CC)' \
- '-I../include $(+sysdep-includes) $(sysincludes) -I..'
+ '-I../include $(+sysdep-includes) $(sysincludes) -I..'; \
+ $(evaluate-test)
generated = $(wildcard $(objpfx)conform-*.out)
tests: $(objpfx)order-cmp.out
endif
$(objpfx)order-cmp.out: $(objpfx)order.out
- (echo "0123456789" | cmp $< -) > $@
+ (echo "0123456789" | cmp $< -) > $@; \
+ $(evaluate-test)
$(objpfx)vismain: $(addprefix $(objpfx),vismod1.so vismod2.so)
$(objpfx)vismain.out: $(addprefix $(objpfx),vismod3.so)
$(objpfx)noload.out: $(objpfx)testobj5.so
$(objpfx)noload-mem: $(objpfx)noload.out
- $(common-objpfx)malloc/mtrace $(objpfx)noload.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)noload.mtrace > $@; \
+ $(evaluate-test)
noload-ENV = MALLOC_TRACE=$(objpfx)noload.mtrace
LDFLAGS-nodelete = -rdynamic
$(objpfx)tst-pathopt: $(libdl)
$(objpfx)tst-pathopt.out: tst-pathopt.sh $(objpfx)tst-pathopt \
$(objpfx)pathoptobj.so
- $(SHELL) $< $(common-objpfx) '$(test-wrapper-env)'
+ $(SHELL) $< $(common-objpfx) '$(test-wrapper-env)'; \
+ $(evaluate-test)
$(objpfx)tst-rtld-load-self.out: tst-rtld-load-self.sh $(objpfx)ld.so
- $(SHELL) $^ '$(test-wrapper)' '$(test-wrapper-env)' > $@
+ $(SHELL) $^ '$(test-wrapper)' '$(test-wrapper-env)' > $@; \
+ $(evaluate-test)
$(objpfx)initfirst: $(libdl)
$(objpfx)initfirst.out: $(objpfx)firstobj.so
endif
$(objpfx)tst-array1-cmp.out: tst-array1.exp $(objpfx)tst-array1.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-array1-static-cmp.out: tst-array1.exp \
$(objpfx)tst-array1-static.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-array2: $(objpfx)tst-array2dep.so
$(objpfx)tst-array2-cmp.out: tst-array2.exp $(objpfx)tst-array2.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-array3-cmp.out: tst-array1.exp $(objpfx)tst-array3.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-array4: $(libdl)
$(objpfx)tst-array4.out: $(objpfx)tst-array2dep.so
$(objpfx)tst-array4-cmp.out: tst-array4.exp $(objpfx)tst-array4.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-array5: $(objpfx)tst-array5dep.so
$(objpfx)tst-array5-cmp.out: tst-array5.exp $(objpfx)tst-array5.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-array5-static-cmp.out: tst-array5-static.exp \
$(objpfx)tst-array5-static.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
CFLAGS-tst-pie1.c += $(pie-ccflag)
$(objpfx)check-textrel.out: $(..)scripts/check-textrel.awk \
$(all-built-dso:=.dyn)
- LC_ALL=C $(AWK) -f $^ > $@
+ LC_ALL=C $(AWK) -f $^ > $@; \
+ $(evaluate-test)
generated += check-textrel.out
$(objpfx)execstack-default: $(first-word $(wildcard $(sysdirs:%=%/stackinfo.h)))
$(objpfx)check-execstack.out: $(..)scripts/check-execstack.awk \
$(objpfx)execstack-default \
$(all-built-dso:=.phdr)
- LC_ALL=C $(AWK) -f $^ > $@
+ LC_ALL=C $(AWK) -f $^ > $@; \
+ $(evaluate-test)
generated += check-execstack.out
$(objpfx)tst-dlmodcount: $(libdl)
localplt.data
LC_ALL=C $(AWK) -f $(filter-out $< %localplt.data,$^) | \
LC_ALL=C $(AWK) -f $< $(filter %localplt.data,$^) - \
- > $@
+ > $@; \
+ $(evaluate-test)
endif
$(objpfx)tst-dlopenrpathmod.so: $(libdl)
$(objpfx)order2: $(libdl)
$(objpfx)order2.out: $(objpfx)order2mod1.so $(objpfx)order2mod2.so
$(objpfx)order2-cmp.out: $(objpfx)order2.out
- (echo "12345" | cmp $< -) > $@
+ (echo "12345" | cmp $< -) > $@; \
+ $(evaluate-test)
$(objpfx)order2mod1.so: $(objpfx)order2mod4.so
$(objpfx)order2mod4.so: $(objpfx)order2mod3.so
$(objpfx)order2mod2.so: $(objpfx)order2mod3.so
$(objpfx)tst-leaks1: $(libdl)
$(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1.mtrace > $@; \
+ $(evaluate-test)
$(objpfx)tst-leaks1-static: $(common-objpfx)dlfcn/libdl.a
$(objpfx)tst-leaks1-static-mem: $(objpfx)tst-leaks1-static.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1-static.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks1-static.mtrace > $@; \
+ $(evaluate-test)
tst-leaks1-ENV = MALLOC_TRACE=$(objpfx)tst-leaks1.mtrace
tst-leaks1-static-ENV = MALLOC_TRACE=$(objpfx)tst-leaks1-static.mtrace
tests: $(objpfx)tst-initorder-cmp.out
endif
$(objpfx)tst-initorder-cmp.out: tst-initorder.exp $(objpfx)tst-initorder.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-initorder2: $(objpfx)tst-initorder2a.so $(objpfx)tst-initorder2d.so $(objpfx)tst-initorder2c.so
$(objpfx)tst-initorder2a.so: $(objpfx)tst-initorder2b.so
tests: $(objpfx)tst-initorder2-cmp.out
endif
$(objpfx)tst-initorder2-cmp.out: tst-initorder2.exp $(objpfx)tst-initorder2.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-relsort1: $(libdl)
$(objpfx)tst-relsort1mod1.so: $(libm) $(objpfx)tst-relsort1mod2.so
LD_PRELOAD= \
$(elf-objpfx)${rtld-installed-name} \
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)) \
- $< > $@
+ $< > $@; \
+ $(evaluate-test)
$(objpfx)tst-unused-dep-cmp.out: $(objpfx)tst-unused-dep.out
- cmp $< /dev/null > $@
+ cmp $< /dev/null > $@; \
+ $(evaluate-test)
ifeq (yes,$(build-shared))
tests: $(objpfx)tst_fgetgrent.out
$(objpfx)tst_fgetgrent.out: tst_fgetgrent.sh $(objpfx)tst_fgetgrent
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+ $(evaluate-test)
endif
endif
rm -f $$tmp; \
$(make-test-out) --output=$$tmp --nostdlib $(inst_gconvdir) && \
cmp $$tmp $(inst_gconvdir)/gconv-modules.cache && \
- rm -f $$tmp
+ rm -f $$tmp; \
+ $(evaluate-test)
tst-loading-ENV = MALLOC_TRACE=$(objpfx)tst-loading.mtrace
$(objpfx)mtrace-tst-loading: $(objpfx)tst-loading.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-loading.mtrace > $@; \
+ $(evaluate-test)
$(objpfx)bug-iconv1.out: $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so))
$(objpfx)iconv-test.out: run-iconv-test.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
$(common-objdir)/iconv/iconv_prog TESTS
- $(SHELL) $< $(common-objdir) '$(test-wrapper)' > $@
+ $(SHELL) $< $(common-objdir) '$(test-wrapper)' > $@; \
+ $(evaluate-test)
$(objpfx)tst-tables.out: tst-tables.sh $(objpfx)gconv-modules \
$(addprefix $(objpfx),$(modules.so)) \
$(objpfx)tst-table-from $(objpfx)tst-table-to
$(SHELL) $< $(common-objpfx) $(common-objpfx)iconvdata/ \
- '$(test-program-prefix)' > $@
+ '$(test-program-prefix)' > $@; \
+ $(evaluate-test)
do-tests-clean common-mostlyclean: tst-tables-clean
mv -f $@T $@
$(objpfx)mtrace-tst-gettext: $(objpfx)tst-gettext.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-gettext.mtrace > $@; \
+ $(evaluate-test)
$(objpfx)tst-gettext.out: tst-gettext.sh $(objpfx)tst-gettext
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \
- $(common-objpfx)intl/ $(objpfx)tst-gettext.mtrace
+ $(common-objpfx)intl/ $(objpfx)tst-gettext.mtrace; \
+ $(evaluate-test)
$(objpfx)tst-translit.out: tst-translit.sh $(objpfx)tst-translit
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \
- $(common-objpfx)intl/
+ $(common-objpfx)intl/; \
+ $(evaluate-test)
$(objpfx)tst-gettext2.out: tst-gettext2.sh $(objpfx)tst-gettext2
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \
- $(common-objpfx)intl/
+ $(common-objpfx)intl/; \
+ $(evaluate-test)
$(objpfx)tst-gettext4.out: tst-gettext4.sh $(objpfx)tst-gettext4
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/; \
+ $(evaluate-test)
$(objpfx)tst-gettext6.out: tst-gettext6.sh $(objpfx)tst-gettext6
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)intl/; \
+ $(evaluate-test)
$(objpfx)tst-codeset.out: $(codeset_mo)
$(objpfx)tst-gettext3.out: $(codeset_mo)
tests: $(objpfx)ftwtest.out
$(objpfx)ftwtest.out: ftwtest-sh $(objpfx)ftwtest
- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
+ $(evaluate-test)
endif
$(objpfx)test-freopen.out: test-freopen.sh $(objpfx)test-freopen
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' \
- $(common-objpfx)libio/
+ $(common-objpfx)libio/; \
+ $(evaluate-test)
$(objpfx)tst-fopenloc-cmp.out: ../iconvdata/testdata/ISO-8859-1..UTF8 \
$(objpfx)tst-fopenloc.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)tst-fopenloc-mem.out: $(objpfx)tst-fopenloc.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-fopenloc.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-fopenloc.mtrace > $@; \
+ $(evaluate-test)
+2014-02-21 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile ($(objpfx)sort-test.out): Use $(evaluate-test).
+ ($(objpfx)tst-fmon.out): Likewise.
+ ($(objpfx)tst-numeric.out): Likewise.
+ ($(objpfx)tst-locale.out): Likewise.
+ ($(objpfx)tst-rpmatch.out): Likewise.
+ ($(objpfx)tst-trans.out): Likewise.
+ ($(objpfx)tst-mbswcs.out): Likewise.
+ ($(objpfx)tst-ctype.out): Likewise.
+ ($(objpfx)tst-wctype.out): Likewise.
+ ($(objpfx)tst-langinfo.out): Likewise.
+ ($(objpfx)mtrace-tst-leaks): Likewise.
+
2013-12-26 Chris Leonard <cjl@sugarlabs.org>
* locales/sa_IN: Add lang_name.
$(objpfx)sort-test.out: sort-test.sh $(objpfx)collate-test $(objpfx)xfrm-test \
$(test-input-data) $(addprefix $(objpfx),$(CTYPE_FILES))
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(test-input) \
- > $@
+ > $@; \
+ $(evaluate-test)
$(objpfx)tst-fmon.out: tst-fmon.sh $(objpfx)tst-fmon tst-fmon.data \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
$(SHELL) $< $(common-objpfx) '$(run-program-prefix)' \
'$(test-program-prefix)' tst-fmon.data \
- > $@
+ > $@; \
+ $(evaluate-test)
$(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
$(SHELL) $< $(common-objpfx) '$(test-program-prefix)' tst-numeric.data \
- > $@
+ > $@; \
+ $(evaluate-test)
$(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
$(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@; \
+ $(evaluate-test)
$(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
$(objpfx)tst-fmon.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)' > $@; \
+ $(evaluate-test)
$(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(run-program-prefix)' '$(test-program-prefix)'; \
+ $(evaluate-test)
$(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
$(objpfx)tst-mbswcs2 $(objpfx)tst-mbswcs3 \
$(objpfx)tst-mbswcs4 $(objpfx)tst-mbswcs5 \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+ $(evaluate-test)
$(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
+ $(evaluate-test)
$(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
$(objpfx)sort-test.out tst-wctype.input \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
+ $(evaluate-test)
$(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-cmd)'; \
+ $(evaluate-test)
$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
$(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
endif
tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace \
LOCPATH=$(common-objpfx)localedata
$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@; \
+ $(evaluate-test)
bug-setlocale1-ENV = LOCPATH=$(common-objpfx)localedata
bug-setlocale1-ARGS = -- $(host-test-program-cmd)
ifneq ($(PERL),no)
tests: $(objpfx)tst-mtrace.out
$(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+ $(evaluate-test)
endif
endif
endif
tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace
tst-error1-ARGS = $(objpfx)tst-error1.out
$(objpfx)tst-error1-mem: $(objpfx)tst-error1.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-error1.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-error1.mtrace > $@; \
+ $(evaluate-test)
+2014-02-21 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile ($(objpfx)tst-stack3-mem): Use $(evaluate-test).
+ ($(objpfx)tst-tls6.out): Likewise.
+ ($(objpfx)tst-cleanup0.out): Likewise.
+ ($(objpfx)tst-cleanup0-cmp.out): Likewise.
+ ($(objpfx)tst-cancel-wrappers.out): Likewise.
+ ($(objpfx)tst-oddstacklimit.out): Likewise.
+
2014-02-14 Joseph Myers <joseph@codesourcery.com>
* Makefile ($(objpfx)tst-cleanup0.out): Do not run cmp.
endif
tst-stack3-ENV = MALLOC_TRACE=$(objpfx)tst-stack3.mtrace
$(objpfx)tst-stack3-mem: $(objpfx)tst-stack3.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-stack3.mtrace > $@; \
+ $(evaluate-test)
generated += tst-stack3-mem tst-stack3.mtrace
$(objpfx)tst-cleanup4: $(objpfx)tst-cleanup4aux.o $(shared-thread-library)
$(objpfx)tst-tls5modc.so $(objpfx)tst-tls5modd.so \
$(objpfx)tst-tls5mode.so $(objpfx)tst-tls5modf.so
$(BASH) $< $(common-objpfx) '$(test-via-rtld-prefix)' \
- '$(test-wrapper-env)'
+ '$(test-wrapper-env)'; \
+ $(evaluate-test)
endif
$(objpfx)tst-dlsym1: $(libdl) $(shared-thread-library)
ifeq ($(build-shared),yes)
$(objpfx)tst-cleanup0.out: /dev/null $(objpfx)tst-cleanup0
- $(make-test-out) > $@ 2>&1
+ $(make-test-out) > $@ 2>&1; \
+ $(evaluate-test)
ifeq ($(run-built-tests),yes)
tests: $(objpfx)tst-cleanup0-cmp.out
endif
$(objpfx)tst-cleanup0-cmp.out: tst-cleanup0.expect $(objpfx)tst-cleanup0.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
$(objpfx)crti.o: $(objpfx)pt-crti.o
ln -f $< $@
$(common-objpfx)libc_pic.a \
$(common-objpfx)libc.a \
$(objpfx)libpthread_pic.a \
- $(objpfx)libpthread.a > $@
+ $(objpfx)libpthread.a > $@; \
+ $(evaluate-test)
endif
endif
tests: $(objpfx)tst-oddstacklimit.out
$(objpfx)tst-oddstacklimit.out: $(objpfx)tst-oddstacklimit $(objpfx)tst-basic1
- $(test-program-prefix) $< --command '$(host-test-program-cmd)' > $@
+ $(test-program-prefix) $< --command '$(host-test-program-cmd)' > $@; \
+ $(evaluate-test)
endif
# The tests here better do not run in parallel
+2014-02-21 Joseph Myers <joseph@codesourcery.com>
+
+ * Makefile ($(objpfx)db-symbols.out): Use
+ $(evaluate-test).
+
2013-05-31 Joseph Myers <joseph@codesourcery.com>
* Makefile ($(objpfx)libthread_db.so): Remove dependencies on
tests: $(objpfx)db-symbols.out
$(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \
$(common-objpfx)nptl/libpthread.so
- LC_ALL=C $(READELF) -W -s $(filter %.so,$^) | $(AWK) -f $< > $@
+ LC_ALL=C $(READELF) -W -s $(filter %.so,$^) | $(AWK) -f $< > $@; \
+ $(evaluate-test)
$(objpfx)db-symbols.v.i: db-symbols.awk
tests: $(objpfx)globtest.out $(objpfx)wordexp-tst.out
$(objpfx)globtest.out: globtest.sh $(objpfx)globtest
$(SHELL) $< $(common-objpfx) '$(test-via-rtld-prefix)' \
- '$(test-program-prefix)' '$(test-wrapper-env)'
+ '$(test-program-prefix)' '$(test-wrapper-env)'; \
+ $(evaluate-test)
$(objpfx)wordexp-tst.out: wordexp-tst.sh $(objpfx)wordexp-test
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+ $(evaluate-test)
endif
endif
$(objpfx)annexc.out: $(objpfx)annexc
-$(dir $<)$(notdir $<) '$(CC)' \
- '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include $(+sysdep-includes) $(sysincludes) -I..' > $@
+ '$(patsubst %,-I../%,$(sorted-subdirs)) -I../include $(+sysdep-includes) $(sysincludes) -I..' > $@; \
+ $(evaluate-test)
annexc-CFLAGS = -O
$(objpfx)annexc: annexc.c
tst-fnmatch-ENV += MALLOC_TRACE=$(objpfx)tst-fnmatch.mtrace
$(objpfx)tst-fnmatch-mem: $(objpfx)tst-fnmatch.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-fnmatch.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-fnmatch.mtrace > $@; \
+ $(evaluate-test)
bug-regex2-ENV = MALLOC_TRACE=$(objpfx)bug-regex2.mtrace
$(objpfx)bug-regex2-mem: $(objpfx)bug-regex2.out
- $(common-objpfx)malloc/mtrace $(objpfx)bug-regex2.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)bug-regex2.mtrace > $@; \
+ $(evaluate-test)
bug-regex14-ENV = MALLOC_TRACE=$(objpfx)bug-regex14.mtrace
$(objpfx)bug-regex14-mem: $(objpfx)bug-regex14.out
- $(common-objpfx)malloc/mtrace $(objpfx)bug-regex14.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)bug-regex14.mtrace > $@; \
+ $(evaluate-test)
bug-regex21-ENV = MALLOC_TRACE=$(objpfx)bug-regex21.mtrace
$(objpfx)bug-regex21-mem: $(objpfx)bug-regex21.out
- $(common-objpfx)malloc/mtrace $(objpfx)bug-regex21.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)bug-regex21.mtrace > $@; \
+ $(evaluate-test)
bug-regex31-ENV = MALLOC_TRACE=$(objpfx)bug-regex31.mtrace
$(objpfx)bug-regex31-mem: $(objpfx)bug-regex31.out
- $(common-objpfx)malloc/mtrace $(objpfx)bug-regex31.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)bug-regex31.mtrace > $@; \
+ $(evaluate-test)
tst-vfork3-ENV = MALLOC_TRACE=$(objpfx)tst-vfork3.mtrace
$(objpfx)tst-vfork3-mem: $(objpfx)tst-vfork3.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-vfork3.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-vfork3.mtrace > $@; \
+ $(evaluate-test)
# tst-rxspencer.mtrace is not generated, only
# tst-rxspencer-no-utf8.mtrace, since otherwise the file has almost
# 100M and takes very long time to process.
tst-rxspencer-no-utf8-ENV += MALLOC_TRACE=$(objpfx)tst-rxspencer-no-utf8.mtrace
$(objpfx)tst-rxspencer-no-utf8-mem: $(objpfx)tst-rxspencer-no-utf8.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-rxspencer-no-utf8.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-rxspencer-no-utf8.mtrace \
+ > $@; \
+ $(evaluate-test)
tst-pcre-ENV = MALLOC_TRACE=$(objpfx)tst-pcre.mtrace
$(objpfx)tst-pcre-mem: $(objpfx)tst-pcre.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-pcre.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-pcre.mtrace > $@; \
+ $(evaluate-test)
tst-boost-ENV = MALLOC_TRACE=$(objpfx)tst-boost.mtrace
$(objpfx)tst-boost-mem: $(objpfx)tst-boost.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-boost.mtrace > $@; \
+ $(evaluate-test)
$(objpfx)tst-getconf.out: tst-getconf.sh $(objpfx)getconf
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'; \
+ $(evaluate-test)
$(objpfx)bug-ga2-mem: $(objpfx)bug-ga2.out
- $(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)bug-ga2.mtrace > $@; \
+ $(evaluate-test)
bug-ga2-ENV = MALLOC_TRACE=$(objpfx)bug-ga2.mtrace
bug-glob2-ENV = MALLOC_TRACE=$(objpfx)bug-glob2.mtrace
$(objpfx)bug-glob2-mem: $(objpfx)bug-glob2.out
- $(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)bug-glob2.mtrace > $@; \
+ $(evaluate-test)
$(inst_libexecdir)/getconf: $(inst_bindir)/getconf \
$(objpfx)getconf.speclist FORCE
$(objpfx)tst-leaks: $(objpfx)libresolv.so
tst-leaks-ENV = MALLOC_TRACE=$(objpfx)tst-leaks.mtrace
$(objpfx)mtrace-tst-leaks: $(objpfx)tst-leaks.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks.mtrace > $@; \
+ $(evaluate-test)
ifeq ($(run-built-tests),yes)
ifneq (no,$(PERL))
tests: $(objpfx)mtrace-tst-leaks
tst-leaks2-ENV = MALLOC_TRACE=$(objpfx)tst-leaks2.mtrace
$(objpfx)mtrace-tst-leaks2: $(objpfx)tst-leaks2.out
- $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace > $@
+ $(common-objpfx)malloc/mtrace $(objpfx)tst-leaks2.mtrace > $@; \
+ $(evaluate-test)
ifeq ($(run-built-tests),yes)
ifneq (no,$(PERL))
xtests: $(objpfx)mtrace-tst-leaks2
tests: $(objpfx)tst-unbputc.out $(objpfx)tst-printf.out
$(objpfx)tst-unbputc.out: tst-unbputc.sh $(objpfx)tst-unbputc
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+ $(evaluate-test)
$(objpfx)tst-printf.out: tst-printf.sh $(objpfx)tst-printf
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)'; \
+ $(evaluate-test)
endif
CFLAGS-vfprintf.c = -Wno-uninitialized
endif
$(objpfx)tst-setvbuf1.out: /dev/null $(objpfx)tst-setvbuf1
- $(test-program-cmd) > $@ 2>&1
+ $(test-program-cmd) > $@ 2>&1; \
+ $(evaluate-test)
$(objpfx)tst-setvbuf1-cmp.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
ifeq ($(build-shared),yes)
link-libm = $(common-objpfx)math/libm.so
$(objpfx)isomac.out: $(objpfx)isomac
$(dir $<)$(notdir $<) '$(CC)' \
- '-I../include $(+sysdep-includes) $(sysincludes) -I..' > $<.out
+ '-I../include $(+sysdep-includes) $(sysincludes) -I..' > $<.out; \
+ $(evaluate-test)
isomac-CFLAGS = -O
$(objpfx)isomac: isomac.c
$(native-compile)
$(objpfx)tst-fmtmsg.out: tst-fmtmsg.sh $(objpfx)tst-fmtmsg
- $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)stdlib/
+ $(SHELL) $< $(common-objpfx) '$(test-program-prefix)' $(common-objpfx)stdlib/; \
+ $(evaluate-test)
$(objpfx)tst-putenv: $(objpfx)tst-putenvmod.so
LDFLAGS-tst-putenv = $(no-as-needed)
ifeq ($(run-built-tests),yes)
tests: $(objpfx)tst-svc-cmp.out
$(objpfx)tst-svc-cmp.out: tst-svc.expect $(objpfx)tst-svc.out
- cmp $^ > $@
+ cmp $^ > $@; \
+ $(evaluate-test)
endif
tests: $(objpfx)tst-xmmymm.out
$(objpfx)tst-xmmymm.out: ../sysdeps/x86/tst-xmmymm.sh $(objpfx)ld.so
@echo "Checking ld.so for SSE register use. This will take a few seconds..."
- $(SHELL) $< $(objpfx) '$(NM)' '$(OBJDUMP)' '$(READELF)' > $@
+ $(SHELL) $< $(objpfx) '$(NM)' '$(OBJDUMP)' '$(READELF)' > $@; \
+ $(evaluate-test)
endif
projects / platform / upstream / glibc.git / commitdiff