[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: What's pending?



On Fri, Apr 21, 2006 at 07:49:47PM +0300, Niko Tyni wrote:

> > > (although patching DOS-style
> > > newlines away in t/utf8.t seems a bit excessive). 
> > I think the bold ^M were too annoying for me ;-)
> > Is this conversion doing any harm?
> It's cluttering the .diff.gz, hiding the actual modifications.  But YMMV.

Alright, I see your point.

The strange thing is that the line breaks seem to be in DOS style ...

$ svn up
At revision 2614.
$ svn status
$ hd t/utf8.t | head
00000000  23 20 24 52 65 76 69 73  69 6f 6e 3a 20 31 2e 37  |# $Revision: 1.7|
00000010  20 24 0d 0a 23 20 75 74  66 38 2e 74 20 2d 20 74  | $..# utf8.t - t|
00000020  65 73 74 73 20 66 6f 72  20 55 6e 69 63 6f 64 65  |ests for Unicode|
00000030  3a 3a 4d 61 70 55 54 46  38 20 66 75 6e 63 74 69  |::MapUTF8 functi|
00000040  6f 6e 61 6c 69 74 79 20  6f 66 20 49 31 38 4e 3a  |onality of I18N:|
00000050  3a 43 68 61 72 73 65 74  0d 0a 0d 0a 75 73 65 20  |:Charset....use |
00000060  54 65 73 74 3a 3a 4d 6f  72 65 20 6e 6f 5f 70 6c  |Test::More no_pl|
00000070  61 6e 3b 0d 0a 0d 0a 75  73 65 20 73 74 72 69 63  |an;....use stric|
00000080  74 3b 0d 0a 0d 0a 42 45  47 49 4e 20 7b 20 75 73  |t;....BEGIN { us|
00000090  65 5f 6f 6b 28 27 49 31  38 4e 3a 3a 43 68 61 72  |e_ok('I18N::Char|

Many 0d 0a ...

Next check:

$ todos t/utf8.t 
$ svn status
$ fromdos t/utf8.t 
$ svn status
M      t/utf8.t
$ todos t/utf8.t
$ svn status
$ 

Next check:
/tmp/i18n$ svn export svn+alioth://svn.debian.org/svn/pkg-perl/packages/libi18n-charset-perl/branches/upstream/current
/tmp/i18n$ hd current/t/utf8.t | head
00000000  23 20 24 52 65 76 69 73  69 6f 6e 3a 20 31 2e 37  |# $Revision: 1.7|
00000010  20 24 0d 0d 0a 23 20 75  74 66 38 2e 74 20 2d 20  | $...# utf8.t - |
00000020  74 65 73 74 73 20 66 6f  72 20 55 6e 69 63 6f 64  |tests for Unicod|
00000030  65 3a 3a 4d 61 70 55 54  46 38 20 66 75 6e 63 74  |e::MapUTF8 funct|
00000040  69 6f 6e 61 6c 69 74 79  20 6f 66 20 49 31 38 4e  |ionality of I18N|
00000050  3a 3a 43 68 61 72 73 65  74 0d 0d 0a 0d 0d 0a 75  |::Charset......u|
00000060  73 65 20 54 65 73 74 3a  3a 4d 6f 72 65 20 6e 6f  |se Test::More no|
00000070  5f 70 6c 61 6e 3b 0d 0d  0a 0d 0d 0a 75 73 65 20  |_plan;......use |
00000080  73 74 72 69 63 74 3b 0d  0d 0a 0d 0d 0a 42 45 47  |strict;......BEG|
00000090  49 4e 20 7b 20 75 73 65  5f 6f 6b 28 27 49 31 38  |IN { use_ok('I18|

Ah! Here we have 0d 0d 0a!


Ok, I've converted it back to 0d 0d 0a - and the diff is easier to read:

$ svn diff -r2140 t/utf8.t 
Index: t/utf8.t
===================================================================
--- t/utf8.t    (revision 2140)
+++ t/utf8.t    (working copy)
@@ -39,11 +39,11 @@
       {
       skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';
       # Unicode::Map8 aliases:
-      ok(umu8_charset_name("Windows-1-2-5-1") eq "cp1251", 'windows-1-2-5-1');
-      ok(umu8_charset_name("windows-1252") eq "cp1252", 'windows-1252 eq');
-      ok(umu8_charset_name("win-latin-1") eq "cp1252", 'win-latin-1');
-      ok(umu8_charset_name("windows-1252") ne "cp1253", 'windows-1252 ne');
-      ok(umu8_charset_name("windows-1253") eq "cp1253", 'windows-1253');
+      ok(umu8_charset_name("Windows-1-2-5-1") eq "windows-1251", 'windows-1-2-5-1');
+      ok(umu8_charset_name("windows-1252") eq "windows-1252", 'windows-1252 eq');
+      ok(umu8_charset_name("win-latin-1") eq "windows-1252", 'win-latin-1');
+      ok(umu8_charset_name("windows-1252") ne "windows-1253", 'windows-1252 ne');
+      ok(umu8_charset_name("windows-1253") eq "windows-1253", 'windows-1253');
       # Unicode::Map8 names with dummy mib:
       ok(umu8_charset_name("Adobe Zapf Ding Bats") eq "Adobe-Zapf-Dingbats", 'Adobe Zapf Ding Bats');
       ok(umu8_charset_name(" c p 1 0 0 7 9 ") eq "cp10079", ' c p 1 0 0 7 9 ');

$ zless ../build-area/libi18n-charset-perl_1.379-1.diff.gz
[..]
--- libi18n-charset-perl-1.379.orig/t/utf8.t
+++ libi18n-charset-perl-1.379/t/utf8.t
@@ -39,11 +39,11 @@
       {^M
       skip 'Unicode::Map8 is not installed', 7 unless eval 'require Unicode::Map8';^M
       # Unicode::Map8 aliases:^M
-      ok(umu8_charset_name("Windows-1-2-5-1") eq "cp1251", 'windows-1-2-5-1');^M
-      ok(umu8_charset_name("windows-1252") eq "cp1252", 'windows-1252 eq');^M
-      ok(umu8_charset_name("win-latin-1") eq "cp1252", 'win-latin-1');^M
-      ok(umu8_charset_name("windows-1252") ne "cp1253", 'windows-1252 ne');^M
-      ok(umu8_charset_name("windows-1253") eq "cp1253", 'windows-1253');^M
+      ok(umu8_charset_name("Windows-1-2-5-1") eq "windows-1251", 'windows-1-2-5-1');^M
+      ok(umu8_charset_name("windows-1252") eq "windows-1252", 'windows-1252 eq');^M
+      ok(umu8_charset_name("win-latin-1") eq "windows-1252", 'win-latin-1');^M
+      ok(umu8_charset_name("windows-1252") ne "windows-1253", 'windows-1252 ne');^M
+      ok(umu8_charset_name("windows-1253") eq "windows-1253", 'windows-1253');^M
       # Unicode::Map8 names with dummy mib:^M
       ok(umu8_charset_name("Adobe Zapf Ding Bats") eq "Adobe-Zapf-Dingbats", 'Adobe Zapf Ding Bats');^M
       ok(umu8_charset_name(" c p 1 0 0 7 9 ") eq "cp10079", ' c p 1 0 0 7 9 ');^M


Sorry for talking to myself for such a long time ;-)

> > > It might be nice to
> > > have libapp-info-perl for the tests, though (ITP #362967).
> > I have to admit that I'm not really sure how this module actually
> > could be used in this context ...
> Well, t/libi.t says
>         16/24 skipped: App::Info::Lib::Iconv is not installed

Ah ok, now I see it, too ;-)
 
> But that's no big deal. It can be added to the build depends when
> it gets into Debian.

Agreed, I try to remember this.


Cheers,
gregor
 
-- 
 .''`.   http://info.comodo.priv.at/ | gpg key ID: 0x00F3CFE4
 : :' :  infos zur usenet-hierarchie at.*: http://www.usenet.at/
 `. `'   member of https://www.vibe.at/ | how to reply: http://got.to/quote/
   `-    NP: Solomon Burke: Flesh And Blood

Attachment: signature.asc
Description: Digital signature


Reply to: