Author: aurel32
Date: 2008-08-13 04:10:54 +0000 (Wed, 13 Aug 2008)
New Revision: 3095
Modified:
glibc-package/branches/glibc-2.8/debian/rules.d/build.mk
glibc-package/branches/glibc-2.8/debian/testsuite-checking/compare.sh
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-amd64
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-gnu-libc
Log:
- Commit the right version of debian/testsuite-checking/compare.sh
- Update expected-results-x86_64-linux-gnu-libc and
expected-results-x86_64-linux-amd64
- debian/rules.d/build.mk: actually fail when a regression is detected
Modified: glibc-package/branches/glibc-2.8/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-13
01:17:22 UTC (rev 3094)
+++ glibc-package/branches/glibc-2.8/debian/rules.d/build.mk 2008-08-13
04:10:54 UTC (rev 3095)
@@ -95,7 +95,8 @@
$(patsubst %,check_%,$(GLIBC_PASSES)) :: check_% : $(stamp)check_%
$(stamp)check_%: $(stamp)build_%
- @if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
+ @set -e ; \
+ if [ -n "$(findstring nocheck,$(DEB_BUILD_OPTIONS))" ]; then \
echo "Tests have been disabled via DEB_BUILD_OPTIONS." | tee
$(log_results) ; \
elif [ $(call xx,configure_build) != $(call xx,configure_target) ] && \
! $(DEB_BUILDDIR)/elf/ld.so $(DEB_BUILDDIR)/libc.so >/dev/null
2>&1 ; then \
@@ -108,16 +109,18 @@
else \
echo Testing $(curpass); \
find $(DEB_BUILDDIR) -name '*.out' -exec rm {} ';' ; \
- TIMEOUTFACTOR="$$(($(TIMEOUTFACTOR)*5))" $(MAKE) -C $(DEB_BUILDDIR)
$(NJOBS) -k check 2>&1 | tee -a $(log_test); \
+ TIMEOUTFACTOR="$$(($(TIMEOUTFACTOR)*10))" $(MAKE) -C $(DEB_BUILDDIR)
$(NJOBS) -k 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 \
+ echo "***************" ; \
chmod +x debian/testsuite-checking/compare.sh ; \
debian/testsuite-checking/compare.sh $(log_expected) $(log_results)
; \
+ echo "***************" ; \
else \
- echo "***WARNING***" ; \
+ echo "*** WARNING ***" ; \
echo "Please generate expected testsuite results for this arch!" ; \
- echo "***WARNING***" ; \
+ echo "*** WARNING ***" ; \
fi ; \
fi
touch $@
Modified: glibc-package/branches/glibc-2.8/debian/testsuite-checking/compare.sh
===================================================================
--- glibc-package/branches/glibc-2.8/debian/testsuite-checking/compare.sh
2008-08-13 01:17:22 UTC (rev 3094)
+++ glibc-package/branches/glibc-2.8/debian/testsuite-checking/compare.sh
2008-08-13 04:10:54 UTC (rev 3095)
@@ -6,7 +6,7 @@
exit 1
fi;
-REGRESSIONS=$(diff -wBI '^#.*' expected-test-x86_64-linux-gnu-libc /tmp/a |
sed -e '/^>/!d;s/^> //g')
+REGRESSIONS=$(diff -wBI '^#.*' $1 $2 | sed -e '/^>/!d;s/^> //g')
if [ -n "$REGRESSIONS" ] ; then
echo "Encountered regressions that don't match expected failures:"
echo "$REGRESSIONS"
Modified:
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-amd64
===================================================================
---
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-amd64
2008-08-13 01:17:22 UTC (rev 3094)
+++
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-amd64
2008-08-13 04:10:54 UTC (rev 3095)
@@ -3,5 +3,5 @@
# failure number, indicating the signal the process died with.
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
-annexc.out, Error 1
+annexc.out, Error 1 (ignored)
check-localplt.out, Error 1
Modified:
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-gnu-libc
===================================================================
---
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-gnu-libc
2008-08-13 01:17:22 UTC (rev 3094)
+++
glibc-package/branches/glibc-2.8/debian/testsuite-checking/expected-results-x86_64-linux-gnu-libc
2008-08-13 04:10:54 UTC (rev 3095)
@@ -3,5 +3,5 @@
# failure number, indicating the signal the process died with.
# Format: <Failed test>, Error <Make error code> [(ignored)]
#
-annexc.out, Error 1
+annexc.out, Error 1 (ignored)
check-localplt.out, Error 1
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
