From: Bruno Haible <bruno@clisp.org>
Date: Fri, 1 Nov 2002 14:59:42 +0000 (+0000)
Subject: Remove temp files more reliably.
X-Git-Tag: v0.12~1231
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31fa78d2f07132ac8856d4c1c55816e85b7c3952;p=thirdparty%2Fgettext.git

Remove temp files more reliably.
---

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b62480074..031d109be 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,13 @@
+2002-11-01  Bruno Haible  <bruno@clisp.org>
+
+	* format-awk-1, format-awk-2, format-c-1, format-c-2, format-elisp-1,
+	format-elisp-2, format-java-1, format-java-2, format-librep-1,
+	format-librep-2, format-lisp-1, format-lisp-2, format-pascal-1,
+	format-pascal-2, format-php-1, format-php-2, format-python-1,
+	format-python-2, format-tcl-1, format-tcl-2, format-ycp-1,
+	format-ycp-2: Remove the temporary files immediately after each round.
+	Needed for Solaris /bin/sh.
+
 2002-10-31  Bruno Haible  <bruno@clisp.org>
 
 	* xgettext-20: Fix typo.
diff --git a/tests/format-awk-1 b/tests/format-awk-1
index e5a2b3a01..3228eb16e 100755
--- a/tests/format-awk-1
+++ b/tests/format-awk-1
@@ -133,6 +133,7 @@ EOF
     cat f-a-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-a-1-$n.in f-a-1-$n.po
 done < f-a-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-awk-2 b/tests/format-awk-2
index 3636cd060..f16ec3f3c 100755
--- a/tests/format-awk-2
+++ b/tests/format-awk-2
@@ -137,6 +137,7 @@ EOF
     cat f-a-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-a-2-$n.po f-a-2-$n.mo
 done < f-a-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-c-1 b/tests/format-c-1
index 647826003..93115a6e8 100755
--- a/tests/format-c-1
+++ b/tests/format-c-1
@@ -157,6 +157,7 @@ EOF
     cat f-c-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-c-1-$n.in f-c-1-$n.po
 done < f-c-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-c-2 b/tests/format-c-2
index 21ec40ba6..4827e34cf 100755
--- a/tests/format-c-2
+++ b/tests/format-c-2
@@ -179,6 +179,7 @@ EOF
     cat f-c-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-c-2-$n.po f-c-2-$n.mo
 done < f-c-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-elisp-1 b/tests/format-elisp-1
index 4886a2935..0c7c4c9ca 100755
--- a/tests/format-elisp-1
+++ b/tests/format-elisp-1
@@ -129,6 +129,7 @@ EOF
     cat f-el-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-el-1-$n.in f-el-1-$n.po
 done < f-el-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-elisp-2 b/tests/format-elisp-2
index b96103d46..e5516e256 100755
--- a/tests/format-elisp-2
+++ b/tests/format-elisp-2
@@ -287,6 +287,7 @@ EOF
     cat f-el-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-el-2-$n.po f-el-2-$n.mo
 done < f-el-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-java-1 b/tests/format-java-1
index 6f2e18c91..697c683ae 100755
--- a/tests/format-java-1
+++ b/tests/format-java-1
@@ -151,6 +151,7 @@ EOF
     cat f-j-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-j-1-$n.in f-j-1-$n.po
 done < f-j-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-java-2 b/tests/format-java-2
index 0058501f6..c7e1b605e 100755
--- a/tests/format-java-2
+++ b/tests/format-java-2
@@ -140,6 +140,7 @@ EOF
     cat f-j-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-j-2-$n.po f-j-2-$n.mo
 done < f-j-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-librep-1 b/tests/format-librep-1
index b5f6d1c3c..ddf97c3b0 100755
--- a/tests/format-librep-1
+++ b/tests/format-librep-1
@@ -103,6 +103,7 @@ EOF
     cat f-lr-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-lr-1-$n.in f-lr-1-$n.po
 done < f-lr-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-librep-2 b/tests/format-librep-2
index db3389da6..05d26ab3a 100755
--- a/tests/format-librep-2
+++ b/tests/format-librep-2
@@ -143,6 +143,7 @@ EOF
     cat f-lr-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-lr-2-$n.po f-lr-2-$n.mo
 done < f-lr-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-lisp-1 b/tests/format-lisp-1
index 9297055d3..ee5de4d7a 100755
--- a/tests/format-lisp-1
+++ b/tests/format-lisp-1
@@ -285,6 +285,7 @@ EOF
     cat f-l-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-l-1-$n.in f-l-1-$n.po
 done < f-l-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-lisp-2 b/tests/format-lisp-2
index f89bacfd8..039a25958 100755
--- a/tests/format-lisp-2
+++ b/tests/format-lisp-2
@@ -197,6 +197,7 @@ EOF
     cat f-l-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-l-2-$n.po f-l-2-$n.mo
 done < f-l-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-pascal-1 b/tests/format-pascal-1
index 6dad327fa..33ab9c90b 100755
--- a/tests/format-pascal-1
+++ b/tests/format-pascal-1
@@ -119,6 +119,7 @@ while read comment; do
     cat f-op-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-op-1-$n.in f-op-1-$n.po
 done < f-op-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-pascal-2 b/tests/format-pascal-2
index c03491d00..d6a53d8cb 100755
--- a/tests/format-pascal-2
+++ b/tests/format-pascal-2
@@ -125,6 +125,7 @@ EOF
     cat f-op-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-op-2-$n.po f-op-2-$n.mo
 done < f-op-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-php-1 b/tests/format-php-1
index 92389aa39..9efb3a541 100755
--- a/tests/format-php-1
+++ b/tests/format-php-1
@@ -109,6 +109,7 @@ while read comment; do
     cat f-ph-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-ph-1-$n.in f-ph-1-$n.po
 done < f-ph-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-php-2 b/tests/format-php-2
index a7b96a12d..83c46e97b 100755
--- a/tests/format-php-2
+++ b/tests/format-php-2
@@ -116,6 +116,7 @@ EOF
     cat f-ph-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-ph-2-$n.po f-ph-2-$n.mo
 done < f-ph-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-python-1 b/tests/format-python-1
index 81b6a4886..2e478041e 100755
--- a/tests/format-python-1
+++ b/tests/format-python-1
@@ -129,6 +129,7 @@ EOF
     cat f-p-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-p-1-$n.in f-p-1-$n.po
 done < f-p-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-python-2 b/tests/format-python-2
index 634239483..597990650 100755
--- a/tests/format-python-2
+++ b/tests/format-python-2
@@ -134,6 +134,7 @@ EOF
     cat f-p-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-p-2-$n.po f-p-2-$n.mo
 done < f-p-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-tcl-1 b/tests/format-tcl-1
index 70cef01f6..02e0cd282 100755
--- a/tests/format-tcl-1
+++ b/tests/format-tcl-1
@@ -135,6 +135,7 @@ EOF
     cat f-t-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-t-1-$n.in f-t-1-$n.po
 done < f-t-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-tcl-2 b/tests/format-tcl-2
index 4e75767e9..fa8d09ac0 100755
--- a/tests/format-tcl-2
+++ b/tests/format-tcl-2
@@ -137,6 +137,7 @@ EOF
     cat f-t-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-t-2-$n.po f-t-2-$n.mo
 done < f-t-2.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-ycp-1 b/tests/format-ycp-1
index ca84aae90..8cd994122 100755
--- a/tests/format-ycp-1
+++ b/tests/format-ycp-1
@@ -57,6 +57,7 @@ EOF
     cat f-y-1-$n.po 1>&2
     exit 1
   fi
+  rm -f f-y-1-$n.in f-y-1-$n.po
 done < f-y-1.data
 
 rm -fr $tmpfiles
diff --git a/tests/format-ycp-2 b/tests/format-ycp-2
index 528615df6..dd6159e38 100755
--- a/tests/format-ycp-2
+++ b/tests/format-ycp-2
@@ -65,6 +65,7 @@ EOF
     cat f-y-2-$n.po 1>&2
     exit 1
   fi
+  rm -f f-y-2-$n.po f-y-2-$n.mo
 done < f-y-2.data
 
 rm -fr $tmpfiles