Remove temp files more reliably.

diff --git a/tests/ChangeLog b/tests/ChangeLog
index b62480074637309f655c0f7b9ee6e083219648b1..031d109bee9d574942769bb29bfee761a98597e8 100644 (file)
--- 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 e5a2b3a015c9da1520aacb74900a66edcbb30d95..3228eb16eceba9392c6589b1395a1b78ab11b5ab 100755 (executable)
--- 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 3636cd06022fd621b139059940c891d8d548bd98..f16ec3f3cd52e5593a099019266b7e29171ba308 100755 (executable)
--- 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 647826003d5c08177faceff6019634f5ef401ba7..93115a6e8ee32891f26bafb96a220a59e2dc2afa 100755 (executable)
--- 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 21ec40ba6009d9c8e9931aa7d670dea37e25adec..4827e34cf311263c3698da4562f64023b0b55f1c 100755 (executable)
--- 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 4886a2935fbeb4e52a1dccae1108127c9477b3d3..0c7c4c9caa1629f31d5de0ca737a534dc2309c99 100755 (executable)
--- 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 b96103d464a85453c8cdbdeca32f6b6eb390b245..e5516e2566f14e14d13c54fa813cc37d3526e236 100755 (executable)
--- 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 6f2e18c919c7d886704311fd5182016d70c1bdb6..697c683ae6322dc955626b71b5051c895b5592c8 100755 (executable)
--- 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 0058501f633f1a4fb33922548b0a21227c97601b..c7e1b605ef6ffc19c5980a0ec4d6257a807eb47a 100755 (executable)
--- 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 b5f6d1c3c9e644c81f2ff794937ce4002fb5efe5..ddf97c3b0ebbc10431a53123f9cee3f9b2b39c6f 100755 (executable)
--- 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 db3389da661b8e8437137ac5c34227833509d25a..05d26ab3ab7cc157e1b45b5ded54851df2fad522 100755 (executable)
--- 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 9297055d33aa1f5b7f97dbebb5f5ffc3b2d77c1f..ee5de4d7afe89bf7e3d56b285c34171bbc483a41 100755 (executable)
--- 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 f89bacfd8aca67af172d5aef705e15e91d483371..039a259585c893ed191696d15a8d5313a4e9cac9 100755 (executable)
--- 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 6dad327facc04900b30e5b8f2e63fe6995947040..33ab9c90b5c19959c673fcada02a03cadd7e75a8 100755 (executable)
--- 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 c03491d007ae3437a80dd835108b7ff3b434b809..d6a53d8cb03401d192c66ea70cfedace226b5221 100755 (executable)
--- 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 92389aa39f4ea019e4349defcccee2c55d3cd225..9efb3a5416138280228320dd2e88f36ce1ec47ea 100755 (executable)
--- 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 a7b96a12dcbec6d535f601f27ed73bda440f6379..83c46e97b528538fbcfa76a531fc257cfdb8036c 100755 (executable)
--- 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 81b6a4886b1ce00ed0e050d26319d00ee9a8963f..2e478041ecfb0b98545fe650f32028ebb9c0198f 100755 (executable)
--- 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 634239483d64513ec6da42f86dc71e9b265a2e88..597990650b429224917d14f8dd8ac322bea8a2e4 100755 (executable)
--- 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 70cef01f6aacfebbf11f1df1d68dbb7a1409577e..02e0cd2826709279ee5f7bc56d525dd8782ff8b4 100755 (executable)
--- 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 4e75767e90842e832bf615c5b68066d33e099155..fa8d09ac05aaea7004ce71fae8d948a162a4ac5b 100755 (executable)
--- 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 ca84aae9036202d5a9430395201f6de11f78a4c4..8cd994122f0261de34caf6b4765d8357245bce25 100755 (executable)
--- 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 528615df6c3871f8dfee92338e37ef9fd55dc24b..dd6159e38b5d372a9dab6d57da14930807973c75 100755 (executable)
--- 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