r6390 - in glibc-package/branches/glibc-2.21/debian: rules.d testsuite-checking
Author: adconrad
Date: 2015-03-19 20:28:42 +0000 (Thu, 19 Mar 2015)
New Revision: 6390
Modified:
glibc-package/branches/glibc-2.21/debian/rules.d/build.mk
glibc-package/branches/glibc-2.21/debian/testsuite-checking/compare.sh
Log:
Clean up testsuite output a bit
Modified: glibc-package/branches/glibc-2.21/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/glibc-2.21/debian/rules.d/build.mk 2015-03-19 18:26:41 UTC (rev 6389)
+++ glibc-package/branches/glibc-2.21/debian/rules.d/build.mk 2015-03-19 20:28:42 UTC (rev 6390)
@@ -137,14 +137,12 @@
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) $(DEB_BUILDDIR) ; \
- echo "***************" ; \
else \
- echo "*** WARNING ***" ; \
+ echo "*************************** WARNING ***************************" ; \
echo "Please generate expected testsuite results for this arch ($(log_expected))!" ; \
- echo "*** WARNING ***" ; \
+ echo "*************************** WARNING ***************************" ; \
fi ; \
fi
@n=$$(grep '^FAIL: ' $(log_test) | wc -l || true); \
Modified: glibc-package/branches/glibc-2.21/debian/testsuite-checking/compare.sh
===================================================================
--- glibc-package/branches/glibc-2.21/debian/testsuite-checking/compare.sh 2015-03-19 18:26:41 UTC (rev 6389)
+++ glibc-package/branches/glibc-2.21/debian/testsuite-checking/compare.sh 2015-03-19 20:28:42 UTC (rev 6390)
@@ -13,12 +13,14 @@
builddir=${3:-.}
+echo "+--------------------------- BEGIN COMPARE ---------------------------+"
+echo "Comparing against $1"
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 "+---------------------------------------------------------------+"
- echo "| Encountered regressions that don't match expected failures: |"
- echo "+---------------------------------------------------------------+"
+ echo "+---------------------------------------------------------------------+"
+ echo "| Encountered regressions that don't match expected failures: |"
+ echo "+---------------------------------------------------------------------+"
echo "$REGRESSIONS"
for test in $REGRESSIONS
do
@@ -39,11 +41,12 @@
fi
if [ -n "$PROGRESSIONS" ] ; then
- echo "+----------------------------------------------------------------+"
- echo "| Encountered progressions that don't match expected failures: |"
- echo "+----------------------------------------------------------------+"
+ echo "+---------------------------------------------------------------------+"
+ echo "| Encountered progressions that don't match expected failures: |"
+ echo "+---------------------------------------------------------------------+"
echo "$PROGRESSIONS"
fi
+echo "+---------------------------- END COMPARE ----------------------------+"
rm -f $expected $results
# This would be a lovely place to exit 0 if you wanted to disable hard failures
Reply to: