Author: aurel32
Date: 2015-12-02 19:12:10 +0000 (Wed, 02 Dec 2015)
New Revision: 6739
Modified:
glibc-package/branches/glibc-2.22/debian/changelog
glibc-package/branches/glibc-2.22/debian/rules.d/build.mk
Log:
Revert commit r6735
Modified: glibc-package/branches/glibc-2.22/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 19:10:01 UTC
(rev 6738)
+++ glibc-package/branches/glibc-2.22/debian/changelog 2015-12-02 19:12:10 UTC
(rev 6739)
@@ -2,8 +2,6 @@
[ Aurelien Jarno ]
* debian/debhelper.in/libc-dev.install: install libmvec_nonshared.a.
- * debian/rules.d/build.mk: use logme instead of tee to fail the build if the
- testsuite fails to build, instead of fully ignoring it.
* debian/control.in/main, debian/rules: build with gcc-5.
* kfreebsd/local-sysdeps.diff: update to revision 5845 (from glibc-bsd).
* debian/sysdeps/ppc64el.mk: use default gcc options.
Modified: glibc-package/branches/glibc-2.22/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.22/debian/rules.d/build.mk 2015-12-02
19:10:01 UTC (rev 6738)
+++ glibc-package/branches/glibc-2.22/debian/rules.d/build.mk 2015-12-02
19:12:10 UTC (rev 6739)
@@ -135,7 +135,7 @@
else \
echo Testing $(curpass) / $(log_results); \
find $(DEB_BUILDDIR) -name '*.out' -exec rm {} ';' ; \
- $(call logme, $(log_test), LD_PRELOAD="" LANG="" TIMEOUTFACTOR="50"
$(MAKE) -C $(DEB_BUILDDIR) $(NJOBS) check 2>&1) ; \
+ LD_PRELOAD="" LANG="" TIMEOUTFACTOR="50" $(MAKE) -C $(DEB_BUILDDIR)
$(NJOBS) check 2>&1 | tee $(log_test); \
chmod +x debian/testsuite-checking/convertlog.sh ; \
debian/testsuite-checking/convertlog.sh $(log_test) | tee
$(log_results) ; \
if test -f $(log_expected) ; then \
