[Po4a-commits] r2578 - in /trunk/t: 05-config.t 12-porefs.t 23-man.t 24-tex.t 28-msguntypot.t

barbier at users.alioth.debian.org barbier at users.alioth.debian.org
Sun Sep 9 20:00:10 UTC 2012


Author: barbier
Date: Sun Sep  9 20:00:09 2012
New Revision: 2578

URL: http://svn.debian.org/wsvn/po4a/?sc=1&rev=2578
Log:
Use compare-po.pl to compare PO files in unit tests

In fact, " -I '^# *\n'" did not work as expected, it should have been written as " -I '^# *\$'".
A better solution is to use compare_po.pl instead.

Modified:
    trunk/t/05-config.t
    trunk/t/12-porefs.t
    trunk/t/23-man.t
    trunk/t/24-tex.t
    trunk/t/28-msguntypot.t

Modified: trunk/t/05-config.t
URL: http://svn.debian.org/wsvn/po4a/trunk/t/05-config.t?rev=2578&op=diff
==============================================================================
--- trunk/t/05-config.t (original)
+++ trunk/t/05-config.t Sun Sep  9 20:00:09 2012
@@ -10,21 +10,12 @@
 
 mkdir "t/tmp" unless -e "t/tmp";
 
-my $diff_po_flags = " -I '^# .* translations for .* package'".
-                    " -I '^# Copyright (C) .* Free Software Foundation, Inc.'".
-                    " -I '^# Automatically generated, '".
-                    " -I '^# *\n'".
-                    " -I '^\"Project-Id-Version: '".
-                    " -I '^\"POT-Creation-Date: '".
-                    " -I '^\"PO-Revision-Date: '".
-                    " -I '^\"Language: '";
-
 $tests[0]{'run'}  =
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test0.conf > tmp/err 2>&1';
 @{$tests[0]{'test'}} =
     ("diff -u data-05/test0.err tmp/err",
-     "diff -u $diff_po_flags data-05/test0.pot tmp/test0.pot",
-     "diff -u $diff_po_flags data-05/test0.fr.po-empty tmp/test0.fr.po",
+     "perl compare-po.pl data-05/test0.pot tmp/test0.pot",
+     "perl compare-po.pl data-05/test0.fr.po-empty tmp/test0.fr.po",
      "test ! -e tmp/test0_man.fr.1");
 $tests[0]{'doc'}  = 'simple config file - init';
 
@@ -34,8 +25,8 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test0.conf > tmp/err 2>&1';
 @{$tests[1]{'test'}} =
     ("diff -u data-05/test1.err tmp/err",
-     "diff -u $diff_po_flags data-05/test0.pot tmp/test0.pot",
-     "diff -u $diff_po_flags data-05/test0.fr.po tmp/test0.fr.po",
+     "perl compare-po.pl data-05/test0.pot tmp/test0.pot",
+     "perl compare-po.pl data-05/test0.fr.po tmp/test0.fr.po",
      "diff -u data-05/test0_man.fr.1 tmp/test0_man.fr.1");
 $tests[1]{'doc'}  = 'simple config file - with translation';
 
@@ -44,11 +35,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test2.conf > tmp/err 2>&1';
 @{$tests[2]{'test'}} =
     ("diff -u data-05/test2.err tmp/err",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po-empty tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po-empty tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po-empty tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po-empty tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po-empty tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po-empty tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po-empty tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po-empty tmp/test2.de.po",
      "test ! -e tmp/test2_man.fr.1",
      "test ! -e tmp/test2_man.es.1",
      "test ! -e tmp/test2_man.it.1",
@@ -61,11 +52,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test2.conf > tmp/err 2>&1';
 @{$tests[3]{'test'}} =
     ("diff -u data-05/test3.err tmp/err",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po tmp/test2.de.po",
      "diff -u data-05/test2_man.fr.1 tmp/test2_man.fr.1",
      "test ! -e tmp/test2_man.es.1",
      "diff -u data-05/test2_man.it.1 tmp/test2_man.it.1",
@@ -78,11 +69,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -v -k 0 data-05/test2.conf >tmp/err 2>&1';
 @{$tests[4]{'test'}} =
     ("sed -e 's,^\.* done\.,. done.,' -e 's,^tmp/test2\\.[^:]*\.po: ,,' tmp/err | diff -u data-05/test4.err -",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po tmp/test2.de.po",
      "diff -u data-05/test2_man.fr.1 tmp/test2_man.fr.1",
      "diff -u data-05/test2_man.es.1 tmp/test2_man.es.1",
      "diff -u data-05/test2_man.it.1 tmp/test2_man.it.1",
@@ -95,11 +86,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -v data-05/test3.conf > tmp/err 2>&1';
 @{$tests[5]{'test'}} =
     ("sed -e 's,^\.* done\.,. done.,' -e 's,^tmp/test2\\.[^:]*\.po: ,,' tmp/err | diff -u data-05/test4.err -",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po tmp/test2.de.po",
      "diff -u data-05/test2_man.fr.1 tmp/test2_man.fr.1",
      "diff -u data-05/test2_man.es.1 tmp/test2_man.es.1",
      "diff -u data-05/test2_man.it.1 tmp/test2_man.it.1",
@@ -112,11 +103,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test4.conf > tmp/err 2>&1';
 @{$tests[6]{'test'}} =
     ("diff -u data-05/test6.err tmp/err",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po tmp/test2.de.po",
      "diff -u data-05/test2_man.fr.1 tmp/test2_man.fr.1",
      "diff -u data-05/test2_man.es.1 tmp/test2_man.es.1",
      "diff -u data-05/test2_man.it.1 tmp/test2_man.it.1",
@@ -129,11 +120,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test5.conf > tmp/err 2>&1';
 @{$tests[7]{'test'}} =
     ("diff -u data-05/test7.err tmp/err",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po tmp/test2.de.po",
      "diff -u data-05/test2_man.fr.1 tmp/test2_man.fr.1",
      "diff -u data-05/test2_man.es.1 tmp/test2_man.es.1",
      "diff -u data-05/test2_man.it.1 tmp/test2_man.it.1",
@@ -145,11 +136,11 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -f data-05/test8.conf > tmp/err 2>&1';
 @{$tests[8]{'test'}} =
     ("diff -u data-05/test3.err tmp/err",
-     "diff -u $diff_po_flags data-05/test2.pot tmp/test2.pot",
-     "diff -u $diff_po_flags data-05/test2.fr.po tmp/test2.fr.po",
-     "diff -u $diff_po_flags data-05/test2.es.po tmp/test2.es.po",
-     "diff -u $diff_po_flags data-05/test2.it.po tmp/test2.it.po",
-     "diff -u $diff_po_flags data-05/test2.de.po tmp/test2.de.po",
+     "perl compare-po.pl data-05/test2.pot tmp/test2.pot",
+     "perl compare-po.pl data-05/test2.fr.po tmp/test2.fr.po",
+     "perl compare-po.pl data-05/test2.es.po tmp/test2.es.po",
+     "perl compare-po.pl data-05/test2.it.po tmp/test2.it.po",
+     "perl compare-po.pl data-05/test2.de.po tmp/test2.de.po",
      "diff -u data-05/test2_man.fr.1 tmp/test2_man.fr.1",
      "test ! -e tmp/test2_man.es.1",
      "diff -u data-05/test2_man.it.1 tmp/test2_man.it.1",

Modified: trunk/t/12-porefs.t
URL: http://svn.debian.org/wsvn/po4a/trunk/t/12-porefs.t?rev=2578&op=diff
==============================================================================
--- trunk/t/12-porefs.t (original)
+++ trunk/t/12-porefs.t Sun Sep  9 20:00:09 2012
@@ -10,23 +10,14 @@
 
 mkdir "t/tmp" unless -e "t/tmp";
 
-my $diff_po_flags = " -I '^# .* translations for .* package'".
-                    " -I '^# Copyright (C) .* Free Software Foundation, Inc.'".
-                    " -I '^# Automatically generated, '".
-                    " -I '^# *\$'".
-                    " -I '^\"Project-Id-Version: '".
-                    " -I '^\"POT-Creation-Date: '".
-                    " -I '^\"PO-Revision-Date: '".
-                    " -I '^\"Language: '";
-
 push @tests, {
   'run'  => 
     'LC_ALL=C COLUMNS=80 perl ../po4a -f --porefs=none data-12/test1.conf > tmp/err 2>&1',
   'test' =>
     ["diff -u data-12/test1.err tmp/err",
-     "diff -u $diff_po_flags data-12/none.pot tmp/test1.pot",
-     "diff -u $diff_po_flags data-12/none.fr.po tmp/test1.fr.po",
-     "diff -u $diff_po_flags data-12/none.de.po tmp/test1.de.po"],
+     "perl compare-po.pl data-12/none.pot tmp/test1.pot",
+     "perl compare-po.pl data-12/none.fr.po tmp/test1.fr.po",
+     "perl compare-po.pl data-12/none.de.po tmp/test1.de.po"],
   'doc'  => 'po4a --porefs=none flag'
 },
 
@@ -35,9 +26,9 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -f --porefs=noline data-12/test1.conf > tmp/err 2>&1',
   'test' =>
     ["diff -u data-12/test1.err tmp/err",
-     "diff -u $diff_po_flags data-12/noline.pot tmp/test1.pot",
-     "diff -u $diff_po_flags data-12/noline.fr.po tmp/test1.fr.po",
-     "diff -u $diff_po_flags data-12/noline.de.po tmp/test1.de.po"],
+     "perl compare-po.pl data-12/noline.pot tmp/test1.pot",
+     "perl compare-po.pl data-12/noline.fr.po tmp/test1.fr.po",
+     "perl compare-po.pl data-12/noline.de.po tmp/test1.de.po"],
   'doc'  => 'po4a --porefs=noline flag'
 },
 
@@ -46,9 +37,9 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -f --porefs=noline,wrap data-12/test1.conf > tmp/err 2>&1',
   'test' =>
     ["diff -u data-12/test1.err tmp/err",
-     "diff -u $diff_po_flags data-12/noline_wrap.pot tmp/test1.pot",
-     "diff -u $diff_po_flags data-12/noline_wrap.fr.po tmp/test1.fr.po",
-     "diff -u $diff_po_flags data-12/noline_wrap.de.po tmp/test1.de.po"],
+     "perl compare-po.pl data-12/noline_wrap.pot tmp/test1.pot",
+     "perl compare-po.pl data-12/noline_wrap.fr.po tmp/test1.fr.po",
+     "perl compare-po.pl data-12/noline_wrap.de.po tmp/test1.de.po"],
   'doc'  => 'po4a --porefs=noline,wrap flag'
 },
 
@@ -57,9 +48,9 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -f --porefs=noline,nowrap data-12/test1.conf > tmp/err 2>&1',
   'test' =>
     ["diff -u data-12/test1.err tmp/err",
-     "diff -u $diff_po_flags data-12/noline.pot tmp/test1.pot",
-     "diff -u $diff_po_flags data-12/noline.fr.po tmp/test1.fr.po",
-     "diff -u $diff_po_flags data-12/noline.de.po tmp/test1.de.po"],
+     "perl compare-po.pl data-12/noline.pot tmp/test1.pot",
+     "perl compare-po.pl data-12/noline.fr.po tmp/test1.fr.po",
+     "perl compare-po.pl data-12/noline.de.po tmp/test1.de.po"],
   'doc'  => 'po4a --porefs=noline,nowrap flag'
 },
 
@@ -68,9 +59,9 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -f --porefs=full,wrap data-12/test1.conf > tmp/err 2>&1',
   'test' =>
     ["diff -u data-12/test1.err tmp/err",
-     "diff -u $diff_po_flags data-12/full_wrap.pot tmp/test1.pot",
-     "diff -u $diff_po_flags data-12/full_wrap.fr.po tmp/test1.fr.po",
-     "diff -u $diff_po_flags data-12/full_wrap.de.po tmp/test1.de.po"],
+     "perl compare-po.pl data-12/full_wrap.pot tmp/test1.pot",
+     "perl compare-po.pl data-12/full_wrap.fr.po tmp/test1.fr.po",
+     "perl compare-po.pl data-12/full_wrap.de.po tmp/test1.de.po"],
   'doc'  => 'po4a --porefs=full,wrap flag'
 },
 
@@ -79,9 +70,9 @@
     'LC_ALL=C COLUMNS=80 perl ../po4a -f --porefs=full,nowrap data-12/test1.conf > tmp/err 2>&1',
   'test' =>
     ["diff -u data-12/test1.err tmp/err",
-     "diff -u $diff_po_flags data-12/full.pot tmp/test1.pot",
-     "diff -u $diff_po_flags data-12/full.fr.po tmp/test1.fr.po",
-     "diff -u $diff_po_flags data-12/full.de.po tmp/test1.de.po"],
+     "perl compare-po.pl data-12/full.pot tmp/test1.pot",
+     "perl compare-po.pl data-12/full.fr.po tmp/test1.fr.po",
+     "perl compare-po.pl data-12/full.de.po tmp/test1.de.po"],
   'doc'  => 'po4a --porefs=full,nowrap flag'
 };
 

Modified: trunk/t/23-man.t
URL: http://svn.debian.org/wsvn/po4a/trunk/t/23-man.t?rev=2578&op=diff
==============================================================================
--- trunk/t/23-man.t (original)
+++ trunk/t/23-man.t Sun Sep  9 20:00:09 2012
@@ -12,19 +12,17 @@
 
 mkdir "t/tmp" unless -e "t/tmp";
 
-my $diff_po_flags = " -I '^# SOME' -I '^# Test' ".
-  "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:' -I '^\"Language: ' -I '^# *\n'";
 my $diff_pod_flags= " -I 'This file was generated by po4a' ";
 
 # Quotes (3 tests)
 push @tests, {
   'run'  => "perl ../po4a-gettextize -f #format# -m data-23/quotes -p tmp/quotes.pot 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/quotes.pot tmp/quotes.pot",
+  'test' => "perl compare-po.pl data-23/quotes.pot tmp/quotes.pot",
   'doc'  => "gettextize well various quotes",
 }, {
   'run'  => "cp data-23/quotes.fr.po tmp/ && chmod u+w tmp/quotes.fr.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/quotes -p tmp/quotes.fr.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/quotes.fr.po tmp/quotes.fr.po",
+  'test' => "perl compare-po.pl data-23/quotes.fr.po tmp/quotes.fr.po",
   'doc'  => "updatepo for this document",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/quotes -p data-23/quotes.fr.po -l tmp/quotes.fr",
@@ -35,12 +33,12 @@
 # Dots (9 tests)
 push @tests, {
   'run'  => "perl ../po4a-gettextize -f #format# -m data-23/dot1 -p tmp/dot1.pot 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/dot1.pot tmp/dot1.pot",
+  'test' => "perl compare-po.pl data-23/dot1.pot tmp/dot1.pot",
   'doc'  => "gettextize well various lines beginning by a dot (1)",
 }, {
   'run'  => "cp data-23/dot1.fr.po tmp/ && chmod u+w tmp/dot1.fr.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/dot1 -p tmp/dot1.fr.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/dot1.fr.po tmp/dot1.fr.po",
+  'test' => "perl compare-po.pl data-23/dot1.fr.po tmp/dot1.fr.po",
   'doc'  => "updatepo for this document",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/dot1 -p data-23/dot1.fr.po -l tmp/dot1.fr",
@@ -48,27 +46,27 @@
   'doc'  => "translate this document",
 }, {
   'run'  => "LC_ALL=C COLUMNS=80 perl ../po4a-gettextize -f #format# -m data-23/dot2 -p tmp/dot2.pot 2>tmp/dot2.err || true",
-  'test' => "diff -u $diff_po_flags  data-23/dot2.err tmp/dot2.err",
+  'test' => "perl compare-po.pl data-23/dot2.err tmp/dot2.err",
   'doc'  => "gettextize well various lines beginning by a dot (2)",
   'requires' => "Text::WrapI18N",
 }, {
   'run'  => "LC_ALL=C COLUMNS=80 perl ../po4a-gettextize -f #format# -m data-23/dot3 -p tmp/dot3.pot 2>tmp/dot3.err || true",
-  'test' => "diff -u $diff_po_flags  data-23/dot3.err tmp/dot3.err",
+  'test' => "perl compare-po.pl data-23/dot3.err tmp/dot3.err",
   'doc'  => "gettextize well various lines beginning by a dot (3)",
   'requires' => "Text::WrapI18N",
 }, {
   'run'  => "LC_ALL=C COLUMNS=80 perl ../po4a-gettextize -f #format# -m data-23/dot4 -p tmp/dot4.pot 2>tmp/dot4.err || true",
-  'test' => "diff -u $diff_po_flags  data-23/dot4.err tmp/dot4.err",
+  'test' => "perl compare-po.pl data-23/dot4.err tmp/dot4.err",
   'doc'  => "gettextize well various lines beginning by a dot (4)",
   'requires' => "Text::WrapI18N",
 }, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/dot5 -p tmp/dot5.pot 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/dot5.pot tmp/dot5.pot",
+  'test' => "perl compare-po.pl data-23/dot5.pot tmp/dot5.pot",
   'doc'  => "gettextize well various lines beginning by a dot (5)",
 }, {
   'run'  => "cp data-23/dot5.it.po tmp/ && chmod u+w tmp/dot5.it.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/dot5 -p tmp/dot5.it.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/dot5.it.po tmp/dot5.it.po",
+  'test' => "perl compare-po.pl data-23/dot5.it.po tmp/dot5.it.po",
   'doc'  => "updatepo for this document",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/dot5 -p data-23/dot5.it.po -l tmp/dot5.it",
@@ -79,12 +77,12 @@
 # Null argument (3 tests)
 push @tests, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/null -p tmp/null.pot 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/null.pot tmp/null.pot",
+  'test' => "perl compare-po.pl data-23/null.pot tmp/null.pot",
   'doc'  => "gettextize well null argument/paragraphs",
 }, {
   'run'  => "cp data-23/null.fr.po tmp/ && chmod u+w tmp/null.fr.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/null -p tmp/null.fr.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/null.fr.po tmp/null.fr.po",
+  'test' => "perl compare-po.pl data-23/null.fr.po tmp/null.fr.po",
   'doc'  => "updatepo for this document",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/null -p data-23/null.fr.po -l tmp/null.fr",
@@ -95,12 +93,12 @@
 # Escaped tabs and newlines (3 tests)
 push @tests, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/escapes1 -p tmp/escapes1.pot 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/escapes1.pot tmp/escapes1.pot",
+  'test' => "perl compare-po.pl data-23/escapes1.pot tmp/escapes1.pot",
   'doc'  => "gettextize well escaped newlines and tabs",
 }, {
   'run'  => "cp data-23/escapes1.it.po tmp/ && chmod u+w tmp/escapes1.it.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/escapes1 -p tmp/escapes1.it.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/escapes1.it.po tmp/escapes1.it.po",
+  'test' => "perl compare-po.pl data-23/escapes1.it.po tmp/escapes1.it.po",
   'doc'  => "updatepo for this document",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/escapes1 -p data-23/escapes1.it.po -l tmp/escapes1.it",
@@ -111,7 +109,7 @@
 # Fonts
 push @tests, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/fonts -p tmp/fonts.pot",
-  'test' => "diff -u $diff_po_flags  data-23/fonts.pot tmp/fonts.pot",
+  'test' => "perl compare-po.pl data-23/fonts.pot tmp/fonts.pot",
   'doc'  => "gettextize well fonts",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/fonts -p data-23/fonts.en.po -l tmp/fonts.en",
@@ -122,7 +120,7 @@
 # mdoc format
 push @tests, {
     'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/mdoc.1 -p tmp/mdoc.pot 2>/dev/null",
-    'test' => "diff -u $diff_po_flags  data-23/mdoc.pot tmp/mdoc.pot",
+    'test' => "perl compare-po.pl data-23/mdoc.pot tmp/mdoc.pot",
     'doc'  => "gettextize well mdoc",
 }, {
     'run'  => "perl ../po4a-translate -f #format# -m data-23/mdoc.1 -p data-23/mdoc.fr.po -l tmp/mdoc.fr -L ISO-8859-1",
@@ -133,24 +131,24 @@
 # Mixed mdoc and roff format
 push @tests, {
     'run'  => "cp data-23/mixed.fr.po tmp/ && chmod u+w tmp/mixed.fr.po && LC_ALL=C perl ../po4a data-23/mixed.cfg",
-    'test' => "diff -u $diff_po_flags  data-23/mixed.pot tmp/mixed.pot &&".
-              "diff -u $diff_po_flags  data-23/mixed.fr.po tmp/mixed.fr.po &&".
-              "diff -u $diff_po_flags  data-23/mixed1.fr tmp/mixed1.fr &&".
-              "diff -u $diff_po_flags  data-23/mixed2.fr tmp/mixed2.fr &&".
-              "diff -u $diff_po_flags  data-23/mixed3.fr tmp/mixed3.fr &&".
-              "diff -u $diff_po_flags  data-23/mixed4.fr tmp/mixed4.fr",
+    'test' => "perl compare-po.pl data-23/mixed.pot tmp/mixed.pot &&".
+              "perl compare-po.pl data-23/mixed.fr.po tmp/mixed.fr.po &&".
+              "perl compare-po.pl data-23/mixed1.fr tmp/mixed1.fr &&".
+              "perl compare-po.pl data-23/mixed2.fr tmp/mixed2.fr &&".
+              "perl compare-po.pl data-23/mixed3.fr tmp/mixed3.fr &&".
+              "perl compare-po.pl data-23/mixed4.fr tmp/mixed4.fr",
     'doc'  => "mixed config with roff and mdoc"
 };
 
 # Non breaking spaces (7 tests)
 push @tests, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/spaces -p tmp/spaces.pot 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/spaces.pot tmp/spaces.pot",
+  'test' => "perl compare-po.pl data-23/spaces.pot tmp/spaces.pot",
   'doc'  => "gettextize well non breaking spaces",
 }, {
   'run'  => "cp data-23/spaces.fr_latin1.po tmp/ && chmod u+w tmp/spaces.fr_latin1.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/spaces -p tmp/spaces.fr_latin1.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/spaces.fr_latin1.po tmp/spaces.fr_latin1.po",
+  'test' => "perl compare-po.pl data-23/spaces.fr_latin1.po tmp/spaces.fr_latin1.po",
   'doc'  => "updatepo for this document (fr ISO-8859-1)",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/spaces -p data-23/spaces.fr_latin1.po -l tmp/spaces.fr_latin1",
@@ -159,7 +157,7 @@
 }, {
   'run'  => "cp data-23/spaces.fr_utf8.po tmp/ && chmod u+w tmp/spaces.fr_utf8.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/spaces -p tmp/spaces.fr_utf8.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/spaces.fr_utf8.po tmp/spaces.fr_utf8.po",
+  'test' => "perl compare-po.pl data-23/spaces.fr_utf8.po tmp/spaces.fr_utf8.po",
   'doc'  => "updatepo for this document (fr UTF-8)",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/spaces -p data-23/spaces.fr_utf8.po -l tmp/spaces.fr_utf8",
@@ -168,7 +166,7 @@
 }, {
   'run'  => "cp data-23/spaces.ja.po tmp/ && chmod u+w tmp/spaces.ja.po".
 	" && perl ../po4a-updatepo -f #format# -m data-23/spaces -p tmp/spaces.ja.po >/dev/null 2>&1 ",
-  'test' => "diff -u $diff_po_flags  data-23/spaces.ja.po tmp/spaces.ja.po",
+  'test' => "perl compare-po.pl data-23/spaces.ja.po tmp/spaces.ja.po",
   'doc'  => "updatepo for this document (ja EUC-JP)",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/spaces -p data-23/spaces.ja.po -l tmp/spaces.ja",
@@ -179,7 +177,7 @@
 # Hyphens (4 tests)
 push @tests, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/hyphens.1 -p tmp/hyphens.pot -o groff_code=verbatim 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/hyphens.verbatim.pot tmp/hyphens.pot",
+  'test' => "perl compare-po.pl data-23/hyphens.verbatim.pot tmp/hyphens.pot",
   'doc'  => "gettextize well hyphens (verbatim)",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/hyphens.1 -p data-23/hyphens.verbatim.fr.po -l tmp/hyphens.fr -o groff_code=verbatim",
@@ -187,7 +185,7 @@
   'doc'  => "translate this document",
 }, {
   'run'  => "LC_ALL=C perl ../po4a-gettextize -f #format# -m data-23/hyphens.1 -p tmp/hyphens.pot -o groff_code=translate 2>/dev/null",
-  'test' => "diff -u $diff_po_flags  data-23/hyphens.translate.pot tmp/hyphens.pot",
+  'test' => "perl compare-po.pl data-23/hyphens.translate.pot tmp/hyphens.pot",
   'doc'  => "gettextize well hyphens (translate)",
 }, {
   'run'  => "perl ../po4a-translate -f #format# -m data-23/hyphens.1 -p data-23/hyphens.translate.fr.po -l tmp/hyphens.fr -o groff_code=translate",

Modified: trunk/t/24-tex.t
URL: http://svn.debian.org/wsvn/po4a/trunk/t/24-tex.t?rev=2578&op=diff
==============================================================================
--- trunk/t/24-tex.t (original)
+++ trunk/t/24-tex.t Sun Sep  9 20:00:09 2012
@@ -10,21 +10,19 @@
 
 mkdir "t/tmp" unless -e "t/tmp";
 
-my $diff_po_flags = " -I '^# SOME' -I '^# Test' ".
-  "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:' -I '^\"Language: '";
 my $diff_tex_flags= " -I 'This file was generated by po4a' ";
 
 # Simple document (3 tests)
 push @tests, {
   'run'  => "LC_ALL=C COLUMNS=80 perl ../po4a-gettextize -f latex -m data-24/simple.tex -p tmp/simple.pot > tmp/simple-gettextize.out 2>&1",
   'test' => "diff -u data-24/simple-gettextize.out tmp/simple-gettextize.out".
-        " && diff -u $diff_po_flags data-24/simple.pot tmp/simple.pot",
+        " && perl compare-po.pl data-24/simple.pot tmp/simple.pot",
   'doc'  => "gettextize well a simple tex document",
 }, {
   'run'  => "cp data-24/simple.fr.po tmp/ && chmod u+w tmp/simple.fr.po".
         " && LC_ALL=C COLUMNS=80 perl ../po4a-updatepo -f latex -m data-24/simple.tex -p tmp/simple.fr.po > tmp/simple-updatepo.out 2>&1",
   'test' => "diff -u -I '^\.* done\.' data-24/simple-updatepo.out tmp/simple-updatepo.out".
-        " && diff -u $diff_po_flags data-24/simple.fr.po tmp/simple.fr.po",
+        " && perl compare-po.pl data-24/simple.fr.po tmp/simple.fr.po",
   'doc'  => "updatepo for this document",
 }, {
   'run'  => "LC_ALL=C COLUMNS=80 perl ../po4a-translate -f latex -m data-24/simple.tex -p data-24/simple.fr.po -l tmp/simple.fr.tex > tmp/simple-translate.out 2>&1",

Modified: trunk/t/28-msguntypot.t
URL: http://svn.debian.org/wsvn/po4a/trunk/t/28-msguntypot.t?rev=2578&op=diff
==============================================================================
--- trunk/t/28-msguntypot.t (original)
+++ trunk/t/28-msguntypot.t Sun Sep  9 20:00:09 2012
@@ -12,48 +12,46 @@
     mkdir "t/tmp" or die "Can't create test directory t/tmp: $!\n";
 }
 
-my $diff_po_flags = "-I '^\"Language: '";
-
 push @tests, {
   'run' => 'cp ../data-28/test1.po . && chmod u+w test1.po && perl ../../scripts/msguntypot -o ../data-28/test1.old.pot -n ../data-28/test1.new.pot test1.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test1.new.po test1.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test1.new.po test1.po",
   'doc' => 'nominal test',
   };
 push @tests, {
   'run' => 'cp ../data-28/test2.po . && chmod u+w test2.po && perl ../../scripts/msguntypot -o ../data-28/test2.old.pot -n ../data-28/test2.new.pot test2.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test2.new.po test2.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test2.new.po test2.po",
   'doc' => 'fuzzy test',
   };
 # Moved strings are not supported.
 # Only typo fixes!
 #push @tests, {
 #  'run' => 'cp ../data-28/test3.po . && chmod u+w test3.po && perl ../../scripts/msguntypot -o ../data-28/test3.old.pot -n ../data-28/test3.new.pot test3.po',
-#  'test'=> "diff -u $diff_po_flags test3.po ../data-28/test3.new.po",
+#  'test'=> "perl ../compare-po.pl test3.po ../data-28/test3.new.po",
 #  'doc' => 'msg moved test',
 #  };
 push @tests, {
   'run' => 'cp ../data-28/test4.po . && chmod u+w test4.po && perl ../../scripts/msguntypot -o ../data-28/test4.old.pot -n ../data-28/test4.new.pot test4.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test4.new.po test4.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test4.new.po test4.po",
   'doc' => 'plural strings (typo in msgid) test',
   };
 push @tests, {
   'run' => 'cp ../data-28/test5.po . && chmod u+w test5.po && perl ../../scripts/msguntypot -o ../data-28/test5.old.pot -n ../data-28/test5.new.pot test5.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test5.new.po test5.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test5.new.po test5.po",
   'doc' => 'plural strings (typo in msgid_plural) test',
   };
 push @tests, {
   'run' => 'cp ../data-28/test6.po . && chmod u+w test6.po && perl ../../scripts/msguntypot -o ../data-28/test6.old.pot -n ../data-28/test6.new.pot test6.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test6.new.po test6.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test6.new.po test6.po",
   'doc' => 'plural strings (typo in another msgid) test',
   };
 push @tests, {
   'run' => 'cp ../data-28/test7.po . && chmod u+w test7.po && perl ../../scripts/msguntypot -o ../data-28/test7.old.pot -n ../data-28/test7.new.pot test7.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test7.new.po test7.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test7.new.po test7.po",
   'doc' => 'plural fuzzy strings (typo in msgid) test',
   };
 push @tests, {
   'run' => 'cp ../data-28/test8.po . && chmod u+w test8.po && perl ../../scripts/msguntypot -o ../data-28/test8.old.pot -n ../data-28/test8.new.pot test8.po > /dev/null',
-  'test'=> "diff -u $diff_po_flags ../data-28/test8.new.po test8.po",
+  'test'=> "perl ../compare-po.pl ../data-28/test8.new.po test8.po",
   'doc' => 'plural fuzzy strings (typo in msgid_plural) test',
   };
 




More information about the Po4a-commits mailing list