Author: adconrad
Date: 2012-10-26 02:23:30 +0000 (Fri, 26 Oct 2012)
New Revision: 5346
Modified:
glibc-package/branches/eglibc-2.16/debian/changelog
glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk
glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh
Log:
Merge regression/progression test suite improvements from Ubuntu.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 02:09:02 UTC
(rev 5345)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-10-26 02:23:30 UTC
(rev 5346)
@@ -361,6 +361,7 @@
then pass --with-headers=$(WITH_SYSROOT)/$(includedir) to the build.
* Sync support for armel/armhf biarch packages, but keep it disabled.
* Adjust libc.posinst and libc.preinst service restart code for 2.16.
+ * Merge regression/progression test suite improvements from Ubuntu.
-- Aurelien Jarno <[email protected]> Wed, 25 Jul 2012 23:45:58 +0200
Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-10-26
02:09:02 UTC (rev 5345)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-10-26
02:23:30 UTC (rev 5346)
@@ -135,7 +135,7 @@
echo "Testsuite disabled for $(curpass), skipping tests."; \
echo "Tests have been disabled." > $(log_results) ; \
else \
- echo Testing $(curpass); \
+ echo Testing $(curpass) / $(log_results); \
find $(DEB_BUILDDIR) -name '*.out' -exec rm {} ';' ; \
LANG="" TIMEOUTFACTOR="50" $(MAKE) -C $(DEB_BUILDDIR) -k check 2>&1 |
tee $(log_test); \
chmod +x debian/testsuite-checking/convertlog.sh ; \
@@ -147,10 +147,14 @@
echo "***************" ; \
else \
echo "*** WARNING ***" ; \
- echo "Please generate expected testsuite results for this arch!" ; \
+ echo "Please generate expected testsuite results for this arch
($(log_expected))!" ; \
echo "*** WARNING ***" ; \
fi ; \
fi
+ @n=$$(grep '^make.* Error' $(log_test) | wc -l || true); \
+ echo "TEST SUMMARY $(log_test) ($$n matching lines)"; \
+ grep '^make.* Error' $(log_test) || true; \
+ echo "END TEST SUMMARY $(log_test)"
touch $@
$(patsubst %,install_%,$(EGLIBC_PASSES)) :: install_% : $(stamp)install_%
Modified:
glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh
2012-10-26 02:09:02 UTC (rev 5345)
+++ glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh
2012-10-26 02:23:30 UTC (rev 5346)
@@ -8,17 +8,36 @@
expected=$(tempfile)
results=$(tempfile)
-grep -v '^#.*' $1 | sort > $expected
-grep -v '^#.*' $2 | sort > $results
+grep -Ev '^ *$|^#' $1 | sort > $expected
+grep -Ev '^ *$|^#' $2 | sort > $results
-REGRESSIONS=$(diff -wB $expected $results | sed -e '/^>/!d;s/^> //g')
-rm -f $expected $results
+REGRESSIONS=$(diff -wBI '^#.*' $expected $results | sed -e '/^>/!d;s/^> //g')
+PROGRESSIONS=$(diff -wBI '^#.*' $expected $results | sed -e '/^</!d;s/^< //g')
if [ -n "$REGRESSIONS" ] ; then
- echo "Encountered regressions that don't match expected failures:"
+ echo "Encountered regressions that don't match expected failures ($1):"
echo "$REGRESSIONS"
- exit 1
+ for test in $(echo "$REGRESSIONS" | sed -e's/, Error.*//')
+ do
+ echo TEST $test:
+ find . -name "$test" | xargs -r cat
+ done
+ rv=1
else
echo "Passed regression testing. No new failures, no changed error values."
- exit 0
+ for test in $(sed -n '/^[^#]/s/, Error.*//p' $results)
+ do
+ echo TEST $test:
+ find . -name "$test" | xargs -r cat
+ done
+ rv=0
fi
+if [ -n "$PROGRESSIONS" ] ; then
+ echo "Encountered progressions that don't match expected failures:"
+ echo "$PROGRESSIONS"
+fi
+
+rm -f $expected $results
+# This would be a lovely place to exit 0 if you wanted to disable hard failures
+#exit 0
+exit $rv
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
Archive: http://lists.debian.org/[email protected]
