r5410 - in glibc-package/branches/eglibc-2.16/debian: . rules.d testsuite-checking
Author: aurel32
Date: 2012-11-25 16:53:17 +0000 (Sun, 25 Nov 2012)
New Revision: 5410
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:
* debian/testsuite-checking/compare.sh: accept the build directory as an
argument.
Modified: glibc-package/branches/eglibc-2.16/debian/changelog
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 16:50:35 UTC (rev 5409)
+++ glibc-package/branches/eglibc-2.16/debian/changelog 2012-11-25 16:53:17 UTC (rev 5410)
@@ -22,6 +22,8 @@
instead of the bogus BSD version. Fix expected-results-i486-gnu-libc,
expected-results-i686-gnu-i386, expected-results-i686-gnu-i686,
expected-results-i686-gnu-xen accordingly.
+ * debian/testsuite-checking/compare.sh: accept the build directory as an
+ argument.
-- Adam Conrad <adconrad@0c3.net> Sun, 25 Nov 2012 01:18:07 -0700
Modified: glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-11-25 16:50:35 UTC (rev 5409)
+++ glibc-package/branches/eglibc-2.16/debian/rules.d/build.mk 2012-11-25 16:53:17 UTC (rev 5410)
@@ -143,7 +143,7 @@
if test -f $(log_expected) ; then \
echo "***************" ; \
chmod +x debian/testsuite-checking/compare.sh ; \
- debian/testsuite-checking/compare.sh $(log_expected) $(log_results) ; \
+ debian/testsuite-checking/compare.sh $(log_expected) $(log_results) $(DEB_BUILDDIR) ; \
echo "***************" ; \
else \
echo "*** WARNING ***" ; \
Modified: glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh
===================================================================
--- glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh 2012-11-25 16:50:35 UTC (rev 5409)
+++ glibc-package/branches/eglibc-2.16/debian/testsuite-checking/compare.sh 2012-11-25 16:53:17 UTC (rev 5410)
@@ -1,8 +1,8 @@
#!/bin/bash
-if [ $# -ne '2' ]; then
+if [ $# -lt '2' -o $# -gt '3' ]; then
echo -e "\nUsage: Compare a test-expected-* file and a test-results-* file."
- echo -e "$0 : < Expected testsuite results > < Testsuite results >\n";
+ echo -e "$0 : < Expected testsuite results > < Testsuite results > < (optional) build directory >\n";
exit 1
fi;
@@ -11,6 +11,8 @@
grep -Ev '^ *$|^#' $1 | sort > $expected
grep -Ev '^ *$|^#' $2 | sort > $results
+builddir=${3:-.}
+
REGRESSIONS=$(diff -wBI '^#.*' $expected $results | sed -e '/^>/!d;s/^> //g')
PROGRESSIONS=$(diff -wBI '^#.*' $expected $results | sed -e '/^</!d;s/^< //g')
if [ -n "$REGRESSIONS" ] ; then
@@ -19,7 +21,7 @@
for test in $(echo "$REGRESSIONS" | sed -e's/, Error.*//')
do
echo TEST $test:
- find . -name "$test" | xargs -r cat
+ find $builddir -name "$test" | xargs -r cat
done
rv=1
else
@@ -27,7 +29,7 @@
for test in $(sed -n '/^[^#]/s/, Error.*//p' $results)
do
echo TEST $test:
- find . -name "$test" | xargs -r cat
+ find $builddir -name "$test" | xargs -r cat
done
rv=0
fi
Reply to: