X-Git-Url: http://git.sourceforge.jp/view?p=nkf%2Fnkf.git;a=blobdiff_plain;f=NKF.mod%2Ftest.pl;h=b3cb928efa95773cb199ca8b33debab8bf494837;hp=48d2ce9cd61eb105416a00e2a45ae69333cc5a95;hb=b66eee9290f343df2fd500dae09c7e6396034539;hpb=c27fc2150f2ec5daceca7f1726083042d39b5ae3

diff --git a/NKF.mod/test.pl b/NKF.mod/test.pl
index 48d2ce9..b3cb928 100644
--- a/NKF.mod/test.pl
+++ b/NKF.mod/test.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 #
-# nkf test program for nkf 1.7
+# nkf test program for nkf 2.0
 #    Shinji KONO <kono@ie.u-ryukyu.ac.jp>
 # Sun Aug 18 12:25:40 JST 1996
 # Sun Nov  8 00:16:06 JST 1998
@@ -43,26 +43,28 @@ sub library_test {
     $result = NKF::nkf(@nkf,$in);
     print "\nGOT:\n",$result if ($detail || $detail_all);
 
-    if( $nkf =~ /-m/) {
+    if( $nkf =~ /-\S*m/) {
         $result =~ s/ //g;
     }
-    $i = 0;
+    $i = -1;
     foreach $ans (@ans) {
-        if( $nkf =~ /-m/) {
+        $i++;
+        if( $nkf =~ /-\S*m/) {
             $ans =~ s/ //g;
         }
-        last if ($result eq $ans) ;
-        $i++;
+        if ($result eq $ans){
+	    print "Ok\n";
+	    return $result;
+        }
     }
     $ans = @ans[$i];
 
-    print (($result eq $ans)?"Ok\n":"Fail\n");
+    print "Fail\n";
     if ($diff) {
-	if ($result ne $ans) {
-            open(R,"|od -c >tmp.result.bad"); print R $result; close(R);
-            open(R,"|od -c >tmp.expect.bad"); print R $ans; close(R);
-            system "diff -c tmp.result.bad tmp.expect.bad";
-        }
+	open(R,"|od -c >tmp.result.bad"); binmode R; print R $result; close(R);
+	open(R,"|od -c >tmp.expect.bad"); binmode R; print R $ans; close(R);
+	print"$i\n;$result\n;$ans\n" if $nkf[0] eq'-w16B';
+	system "diff -c tmp.result.bad tmp.expect.bad";
     }
     return $result;
 }