Bug #151071, fix testsuite making assumptions about filesystem.

(Portage version: 2.1.2_rc1-r5)

3 files changed, 93 insertions, 3 deletions

diff --git a/app-text/convmv/ChangeLog b/app-text/convmv/ChangeLog
index f79e183edcdb..8078a9988954 100644
--- a/app-text/convmv/ChangeLog
+++ b/app-text/convmv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/convmv
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.21 2006/10/13 10:41:28 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/ChangeLog,v 1.22 2006/11/13 10:24:00 robbat2 Exp $
+
+  13 Nov 2006; Robin H. Johnson <robbat2@gentoo.org>
+  +files/convmv-1.10-testcase-cleanup.patch, convmv-1.10.ebuild:
+  Bug #151071, fix testsuite making assumptions about filesystem.
 
   13 Oct 2006; Markus Rothe <corsair@gentoo.org> convmv-1.09.ebuild:
   Stable on ppc64
diff --git a/app-text/convmv/convmv-1.10.ebuild b/app-text/convmv/convmv-1.10.ebuild
index ce325f1b20fb..5a559c74a0b6 100644
--- a/app-text/convmv/convmv-1.10.ebuild
+++ b/app-text/convmv/convmv-1.10.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.10.ebuild,v 1.2 2006/10/02 22:36:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/convmv/convmv-1.10.ebuild,v 1.3 2006/11/13 10:24:00 robbat2 Exp $
+
+inherit eutils
 
 DESCRIPTION="convert filenames to utf8 or any other charset"
 HOMEPAGE="http://j3e.de/linux/convmv"
@@ -19,5 +21,14 @@ src_compile() {
 
 src_install() {
 	einstall DESTDIR=${D} PREFIX=/usr || die "einstall failed"
-	dodoc CREDITS Changes GPL2 TODO VERSION testsuite.tar
+	dodoc CREDITS Changes TODO VERSION
+}
+
+src_test() {
+	cd ${S}
+	tar xf testsuite.tar
+	# Never make assumptions as to the ordering of files inside a directory!
+	epatch ${FILESDIR}/${PN}-1.10-testcase-cleanup.patch
+	cd ${S}/suite
+	./dotests.sh || die "Tests failed"
 }
diff --git a/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch b/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch
new file mode 100644
index 000000000000..208eaa33103b
--- /dev/null
+++ b/app-text/convmv/files/convmv-1.10-testcase-cleanup.patch
@@ -0,0 +1,75 @@
+--- convmv-1.10.orig/suite/dotests.sh	2006-06-25 15:01:16.000000000 -0700
++++ convmv-1.10/suite/dotests.sh	2006-11-13 02:18:13.373820717 -0800
+@@ -3,62 +3,62 @@
+ # you might want to change this to GNU find's full path:
+ FIND=find
+ FINDEXP="%P -- %l\n"
+-for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" > out-$dir ; done
++for dir in `ls -d test*` ; do $FIND $dir/ -printf "$FINDEXP" | sort > out-$dir ; done
+ #
+ echo smartness-test
+ rm -rf test.tmp
+ cp -r test test.tmp
+ ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
+ false
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test out.tmp > diff.tmp|| { echo "smartness-test failed." ; exit 1; }
+ #
+ echo double-utf8 test
+ ../convmv -f iso8859-15 -t utf8 --notest -r --nosmart test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test-utf8 out.tmp > diff.tmp|| { echo "double-utf8 test failed." ; exit 1; }
+ #
+ ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test out.tmp > diff.tmp|| { echo undo-double-utf8 test failed. ; exit 1; }
+ #
+ echo utf8-to-iso8859-15-test
+ rm -r test.tmp
+ cp -r test test.tmp
+ ../convmv -f utf8 -t iso8859-15 --notest -r test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test-iso8859-15 out.tmp > diff.tmp|| { echo utf8-to-iso8859-15-test failed. ; exit 1; }
+ #
+ echo iso8859-15-to-utf8-test
+ rm -r test.tmp
+ cp -r test-iso8859-15 test.tmp
+ ../convmv -f iso8859-15 -t utf8 --notest -r test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test out.tmp > diff.tmp|| { echo iso8859-15-to-utf8-test failed. ; exit 1; }
+ #
+ echo nfc-test
+ rm -r test.tmp
+ cp -r test test.tmp
+ ../convmv -f utf-8 -t utf-8 --nfd --notest -r test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test-nfd out.tmp > diff.tmp|| { echo nfd-test failed. ; exit 1; }
+ #
+ ../convmv -f utf8 -t utf8 --nfc --notest -r test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test out.tmp > diff.tmp|| { echo nfc-test failed. ; exit 1; }
+ #
+ echo escaped-test
+ rm -r test.tmp
+ cp -r test-escaped test.tmp
+ ../convmv --unescape --notest -r test.tmp
+-$FIND test.tmp -printf "$FINDEXP" > out.tmp
++$FIND test.tmp -printf "$FINDEXP" |sort >out.tmp
+ diff out-test out.tmp > diff.tmp|| { echo escaped-test failed. ; exit 1; }
+ #
+ echo upper-test
+ rm -r test.tmp
+ cp -r test test.tmp
+ ../convmv --upper -f utf8 --notest -r test.tmp
+-$FIND TEST.TMP -printf "$FINDEXP" > out.tmp
++$FIND TEST.TMP -printf "$FINDEXP" |sort >out.tmp
+ diff out-test-upper out.tmp > diff.tmp|| { echo upper-test failed. ; exit 1; }
+ 
+ echo All tests successful, cleaning up now ...