[Po4a-commits] "po4a/t 02-TransTractors.t, 1.11, 1.12 05-config.t, 1.4, 1.5 23-man.t, 1.15, 1.16 24-tex.t, 1.3, 1.4 28-msguntypot.t, 1.5, 1.6"

[Denis Barbier]

Update of /cvsroot/po4a/po4a/t
In directory alioth:/tmp/cvs-serv2496/t

Modified Files:
	02-TransTractors.t 05-config.t 23-man.t 24-tex.t 
	28-msguntypot.t 
Log Message:
Modify tests to work with recent gettext tools, their output have changed.

Index: 24-tex.t
===================================================================
RCS file: /cvsroot/po4a/po4a/t/24-tex.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- 24-tex.t	13 Jan 2008 13:49:54 -0000	1.3
+++ 24-tex.t	19 Jul 2010 19:55:03 -0000	1.4
@@ -11,7 +11,7 @@
 mkdir "t/tmp" unless -e "t/tmp";
 
 my $diff_po_flags = " -I '^# SOME' -I '^# Test' ".
-  "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:'";
+  "-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)

Index: 23-man.t
===================================================================
RCS file: /cvsroot/po4a/po4a/t/23-man.t,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- 23-man.t	14 Mar 2008 22:44:02 -0000	1.15
+++ 23-man.t	19 Jul 2010 19:55:03 -0000	1.16
@@ -13,7 +13,7 @@
 mkdir "t/tmp" unless -e "t/tmp";
 
 my $diff_po_flags = " -I '^# SOME' -I '^# Test' ".
-  "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:'";
+  "-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)

Index: 28-msguntypot.t
===================================================================
RCS file: /cvsroot/po4a/po4a/t/28-msguntypot.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 28-msguntypot.t	3 Mar 2008 23:39:19 -0000	1.5
+++ 28-msguntypot.t	19 Jul 2010 19:55:04 -0000	1.6
@@ -12,7 +12,7 @@
     mkdir "t/tmp" or die "Can't create test directory t/tmp: $!\n";
 }
 
-my $diff_po_flags = "";
+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',

Index: 02-TransTractors.t
===================================================================
RCS file: /cvsroot/po4a/po4a/t/02-TransTractors.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- 02-TransTractors.t	18 Jan 2007 09:16:15 -0000	1.11
+++ 02-TransTractors.t	19 Jul 2010 19:55:03 -0000	1.12
@@ -13,7 +13,7 @@
 mkdir "t/tmp" unless -e "t/tmp";
 
 my $diff_po_flags = " -I '^# SOME' -I '^# Test' ".
-  "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:'";
+  "-I '^\"POT-Creation-Date: ' -I '^\"Content-Transfer-Encoding:' -I '^\"Language: ' -I '^# *\n'";
 my $diff_pod_flags= " -I 'This file was generated by po4a' ";
 
 $tests[0]{'run'}  = "perl ../po4a-gettextize -f #format# -m data-02/#format# -p tmp/po";

Index: 05-config.t
===================================================================
RCS file: /cvsroot/po4a/po4a/t/05-config.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- 05-config.t	20 Jan 2010 18:42:30 -0000	1.4
+++ 05-config.t	19 Jul 2010 19:55:03 -0000	1.5
@@ -13,9 +13,11 @@
 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 '^\"PO-Revision-Date: '".
+                    " -I '^\"Language: '";
 
 $tests[0]{'run'}  =
     'LC_ALL=C COLUMNS=80 perl ../po4a data-05/test0.conf > tmp/err 2>&1';
@@ -75,7 +77,7 @@
     'cp data-05/test2.??.po tmp/ && '.
     'LC_ALL=C COLUMNS=80 perl ../po4a -v -k 0 data-05/test2.conf >tmp/err 2>&1';
 @{$tests[4]{'test'}} =
-    ("diff -u -I '^\.* done\.' data-05/test4.err tmp/err",
+    ("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",
@@ -92,7 +94,7 @@
     'cp data-05/test2.??.po tmp/ && '.
     'LC_ALL=C COLUMNS=80 perl ../po4a -v data-05/test3.conf > tmp/err 2>&1';
 @{$tests[5]{'test'}} =
-    ("diff -u -I '^\.* done\.' data-05/test4.err tmp/err",
+    ("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",