--- a/components/convmv/test/results-64.master Fri Mar 04 11:03:25 2016 -0800
+++ b/components/convmv/test/results-64.master Fri Mar 04 11:07:56 2016 -0800
@@ -1,10 +1,10 @@
-make[1]: Entering directory `$(@D)'
+make[1]: Entering directory '$(@D)'
test -d suite || tar xf testsuite.tar
sed -e 's/\($CONVMV.*\)$/& 2>\&1 | LC_ALL='C' $SORT/' < suite/dotests.sh > suite/dotests-deterministic.sh
chmod +x suite/dotests-deterministic.sh
cd suite ; ./dotests-deterministic.sh
smartness_test
-Ready!
+Ready! I converted 0 files
Skipping, already UTF-8: test.tmp/.hidden Straße
Skipping, already UTF-8: test.tmp/.hidden Straße
Skipping, already UTF-8: test.tmp/2/süb
@@ -42,12 +42,12 @@
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/schön"
mv "test.tmp/schön und gut/äpfel" "test.tmp/schön und gut/Àpfel"
mv "test.tmp/Äpfel" "test.tmp/Ãpfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
double-utf8-test-undo-with-double-utf8-results-test
-Ready!
+Ready! I converted 2 files
mv "test.tmp/euroâ¬" "test.tmp/euro€"
mv "test.tmp/schön und gut" "test.tmp/schön und gut"
-Ready!
+Ready! I converted 1 files
mv "test.tmp/euro€" "test.tmp/euro�"
../füße"
.hidden Straße"
@@ -65,7 +65,7 @@
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/schön"
mv "test.tmp/schön und gut/Àpfel" "test.tmp/schön und gut/äpfel"
mv "test.tmp/Ãpfel" "test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden StraÃe" >> "symlink "test.tmp/a directory/linkzufÃŒÃen": "../fÃŒÃe" >> "Ready!
+symlink "test.tmp/bla": ".hidden StraÃe" >> "symlink "test.tmp/a directory/linkzufÃŒÃen": "../fÃŒÃe" >> "Ready! I converted 16 files
utf8-to-iso8859-15-test
../f��e"
.hidden Stra�e"
@@ -85,7 +85,7 @@
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/sch�n"
mv "test.tmp/schön und gut/äpfel" "test.tmp/schön und gut/�pfel"
mv "test.tmp/Äpfel" "test.tmp/�pfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
iso8859-15-to-utf8-test
../füße"
.hidden Straße"
@@ -105,7 +105,7 @@
mv "test.tmp/sch�n und gut/subdir/sch�n" "test.tmp/sch�n und gut/subdir/schön"
mv "test.tmp/sch�n und gut/�pfel" "test.tmp/sch�n und gut/äpfel"
mv "test.tmp/�pfel" "test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Stra�e" >> "symlink "test.tmp/a directory/linkzuf��en": "../f��e" >> "Ready!
+symlink "test.tmp/bla": ".hidden Stra�e" >> "symlink "test.tmp/a directory/linkzuf��en": "../f��e" >> "Ready! I converted 18 files
nfd-test
../füße"
mv "test.tmp/2/süb" "test.tmp/2/süb"
@@ -120,7 +120,7 @@
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/schön"
mv "test.tmp/schön und gut/äpfel" "test.tmp/schön und gut/äpfel"
mv "test.tmp/Äpfel" "test.tmp/Äpfel"
-symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 13 files
nfd-test-with-nfc-results-test
../füße"
mv "test.tmp/2/Äpfel" "test.tmp/2/Äpfel"
@@ -135,7 +135,7 @@
mv "test.tmp/schön und gut" "test.tmp/schön und gut"
mv "test.tmp/schön und gut/äpfel" "test.tmp/schön und gut/äpfel"
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/schön"
-symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 13 files
escaped-test
../füße"
.hidden Straße"
@@ -156,7 +156,7 @@
mv "test.tmp/sch%C3%B6n%20und%20gut" "test.tmp/schön und gut"
mv "test.tmp/sch%C3%B6n%20und%20gut/%C3%A4pfel" "test.tmp/sch%C3%B6n%20und%20gut/äpfel"
mv "test.tmp/sch%C3%B6n%20und%20gut/subdir/sch%C3%B6n" "test.tmp/sch%C3%B6n%20und%20gut/subdir/schön"
-symlink "test.tmp/bla": ".hidden%20Stra%C3%9Fe" >> "symlink "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen": "../f%C3%BC%C3%9Fe" >> "Ready!
+symlink "test.tmp/bla": ".hidden%20Stra%C3%9Fe" >> "symlink "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen": "../f%C3%BC%C3%9Fe" >> "Ready! I converted 19 files
parsable-test
ln -s "../füße" "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen"
ln -s ".hidden Straße" "test.tmp/bla"
@@ -179,6 +179,14 @@
mv "test.tmp/sch%C3%B6n%20und%20gut/subdir/sch%C3%B6n" "test.tmp/sch%C3%B6n%20und%20gut/subdir/schön"
rm "test.tmp/a%20directory/linkzuf%C3%BC%C3%9Fen"
rm "test.tmp/bla"
+sh: test.tmp/2/s%C3%BCb: not found
+sh: test.tmp/2: cannot execute [Is a directory]
+sh: test.tmp/3: cannot execute [Is a directory]
+sh: test.tmp/a%20directory/subdir: cannot execute [Is a directory]
+sh: test.tmp/a%20directory: not found
+sh: test.tmp/sch%C3%B6n%20und%20gut/subdir: cannot execute [Is a directory]
+sh: test.tmp/sch%C3%B6n%20und%20gut: not found
+sh: test.tmp: not found
upper-test
../FÜßE"
.HIDDEN STRAßE"
@@ -206,7 +214,7 @@
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/SCHÖN"
mv "test.tmp/schön und gut/äpfel" "test.tmp/schön und gut/ÄPFEL"
mv "test.tmp/Äpfel" "test.tmp/ÄPFEL"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 26 files
preserve-mtimes-test
../f��e"
.hidden Stra�e"
@@ -226,7 +234,7 @@
mv "test.tmp/schön und gut/subdir/schön" "test.tmp/schön und gut/subdir/sch�n"
mv "test.tmp/schön und gut/äpfel" "test.tmp/schön und gut/�pfel"
mv "test.tmp/Äpfel" "test.tmp/�pfel"
-symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready!
+symlink "test.tmp/bla": ".hidden Straße" >> "symlink "test.tmp/a directory/linkzufüßen": "../füße" >> "Ready! I converted 18 files
../füße"
.hidden Straße"
mv "test.tmp/.hidden Stra�e" "test.tmp/.hidden Straße"
@@ -245,6 +253,6 @@
mv "test.tmp/sch�n und gut/subdir/sch�n" "test.tmp/sch�n und gut/subdir/schön"
mv "test.tmp/sch�n und gut/�pfel" "test.tmp/sch�n und gut/äpfel"
mv "test.tmp/�pfel" "test.tmp/Äpfel"
-symlink "test.tmp/bla": ".hidden Stra�e" >> "symlink "test.tmp/a directory/linkzuf��en": "../f��e" >> "Ready!
+symlink "test.tmp/bla": ".hidden Stra�e" >> "symlink "test.tmp/a directory/linkzuf��en": "../f��e" >> "Ready! I converted 18 files
All tests successful, cleaning up now ...
-make[1]: Leaving directory `$(@D)'
+make[1]: Leaving directory '$(@D)'