remove locale assumptions

git-svn-id: svn+q:///qpdf/trunk@612 71b93d88-0707-0410-a8cf-f5a4172ac649

3 files changed, 16 insertions, 27 deletions

diff --git a/TODO b/TODO
index 0f0301e7..d705187e 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,3 @@
-Before next release
-===================
-
- * Remove en_US locale tests
-
 General
 =======
 
diff --git a/qpdf/fix-qdf b/qpdf/fix-qdf
index d3544d95..bdc96717 100755
--- a/qpdf/fix-qdf
+++ b/qpdf/fix-qdf
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 
-require 5.008;
+require 5.008_001;
 BEGIN { $^W = 1; }
 use strict;
 
diff --git a/qpdf/qtest/qpdf.test b/qpdf/qtest/qpdf.test
index d3aeded6..f1a7bdd0 100644
--- a/qpdf/qtest/qpdf.test
+++ b/qpdf/qtest/qpdf.test
@@ -216,7 +216,7 @@ my @goodfiles = ("implicit null",			# 1
 		 "lots of compressible objects",	# 20
 		 );
 
-$n_tests += (9 * @goodfiles) + 6;
+$n_tests += (3 * @goodfiles) + 6;
 
 my %goodtest_overrides = ('14' => 3);
 my %goodtest_flags =
@@ -226,17 +226,14 @@ my %goodtest_flags =
 for (my $i = 1; $i <= scalar(@goodfiles); ++$i)
 {
     my $n = $goodtest_overrides{$i} || 1;
-    foreach my $lang (qw(C en_US en_US.UTF-8))
-    {
-	$td->runtest("$goodfiles[$i-1], ($lang)",
-		     {$td->COMMAND => "test_driver $n good$i.pdf"},
-		     {$td->FILE => "good$i.out",
-		      $td->EXIT_STATUS => 0});
-	my $xflags = $goodtest_flags{$i} || '';
-	check_pdf("create qdf",
-		  "qpdf --static-id -qdf $xflags good$i.pdf",
-		  "good$i.qdf", 0);
-    }
+    $td->runtest("$goodfiles[$i-1]",
+		 {$td->COMMAND => "test_driver $n good$i.pdf"},
+		 {$td->FILE => "good$i.out",
+		  $td->EXIT_STATUS => 0});
+    my $xflags = $goodtest_flags{$i} || '';
+    check_pdf("create qdf",
+	      "qpdf --static-id -qdf $xflags good$i.pdf",
+	      "good$i.qdf", 0);
 }
 
 check_pdf("no normalization",
@@ -798,17 +795,14 @@ foreach my $file (@files)
 show_ntests();
 # ----------
 $td->notify("--- fix-qdf Tests ---");
-$n_tests += 6;
+$n_tests += 2;
 
-foreach my $lang qw(C en_US en_US.UTF-8)
+for (my $n = 1; $n <= 2; ++$n)
 {
-    for (my $n = 1; $n <= 2; ++$n)
-    {
-	$td->runtest("fix-qdf $n (LANG=$lang)",
-		     {$td->COMMAND => "LANG=$lang fix-qdf fix$n.qdf"},
-		     {$td->FILE => "fix$n.qdf.out",
-		      $td->EXIT_STATUS => 0});
-    }
+    $td->runtest("fix-qdf $n",
+		 {$td->COMMAND => "fix-qdf fix$n.qdf"},
+		 {$td->FILE => "fix$n.qdf.out",
+		  $td->EXIT_STATUS => 0});
 }
 
 show_ntests();