r3212 - in glibc-package/branches/glibc-2.9/debian: . testsuite-checking
Author: aurel32
Date: 2009-01-06 21:58:14 +0000 (Tue, 06 Jan 2009)
New Revision: 3212
Modified:
glibc-package/branches/glibc-2.9/debian/changelog
glibc-package/branches/glibc-2.9/debian/testsuite-checking/compare.sh
Log:
* testsuite-checking/compare.sh: don't assume expected and current
testsuite results in same order. Closes: bug#504031.
Modified: glibc-package/branches/glibc-2.9/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.9/debian/changelog 2009-01-06 21:30:36 UTC (rev 3211)
+++ glibc-package/branches/glibc-2.9/debian/changelog 2009-01-06 21:58:14 UTC (rev 3212)
@@ -34,10 +34,12 @@
- Remove sparc/cvs-context.diff (merged).
- Remove localedata/locale-ks_IN.diff (replaced upstream by
ks_IN@devanagari).
- * debhelper.in/locales.config: convert ks_IN into ks_IN@devanagari.
- * symbols.wildcards: update for glibc 2.9.
+ * debhelper.in/locales.config: convert ks_IN into ks_IN@devanagari.
+ * symbols.wildcards: update for glibc 2.9.
+ * testsuite-checking/compare.sh: don't assume expected and current
+ testsuite results in same order. Closes: bug#504031.
- -- Aurelien Jarno <aurel32@debian.org> Tue, 06 Jan 2009 22:25:43 +0100
+ -- Aurelien Jarno <aurel32@debian.org> Tue, 06 Jan 2009 22:31:47 +0100
glibc (2.8+20080809-3) experimental; urgency=low
Modified: glibc-package/branches/glibc-2.9/debian/testsuite-checking/compare.sh
===================================================================
--- glibc-package/branches/glibc-2.9/debian/testsuite-checking/compare.sh 2009-01-06 21:30:36 UTC (rev 3211)
+++ glibc-package/branches/glibc-2.9/debian/testsuite-checking/compare.sh 2009-01-06 21:58:14 UTC (rev 3212)
@@ -6,7 +6,13 @@
exit 1
fi;
-REGRESSIONS=$(diff -wBI '^#.*' $1 $2 | sed -e '/^>/!d;s/^> //g')
+expected=$(tempfile)
+results=$(tempfile)
+sort $1 > $expected
+sort $2 > $results
+
+REGRESSIONS=$(diff -wBI '^#.*' $expected $results | sed -e '/^>/!d;s/^> //g')
+rm -f $expected $results
if [ -n "$REGRESSIONS" ] ; then
echo "Encountered regressions that don't match expected failures:"
echo "$REGRESSIONS"
Reply to: