From 6ba6662c69e868290d1e514ffe65ef447e9263d6 Mon Sep 17 00:00:00 2001
From: John Darrington <john@darrington.wattle.id.au>
Date: Tue, 20 May 2008 01:03:21 +0000
Subject: [PATCH] Added "cd /" to the test scripts which don't already have it.
This avoids warnings on platforms which refuse to delete the directory
they're using.
---
po/de.po | 30 +++++++++++++++---------------
po/en_GB.po | 30 +++++++++++++++---------------
tests/bugs/compression.sh | 1 +
tests/bugs/examine-missing2.sh | 1 +
tests/bugs/freq-nolabels.sh | 1 +
tests/bugs/print-crash.sh | 1 +
tests/bugs/signals.sh | 1 +
tests/bugs/t-test-alpha3.sh | 1 +
tests/command/get-data-gnm.sh | 1 +
tests/command/get-data-psql.sh | 1 +
tests/command/insert.sh | 1 +
tests/command/n_of_cases.sh | 1 +
tests/command/npar-binomial.sh | 1 +
tests/command/npar-chisquare.sh | 1 +
tests/command/print-strings.sh | 1 +
tests/command/rank.sh | 1 +
tests/command/very-long-strings.sh | 1 +
17 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/po/de.po b/po/de.po
index c332ac3dac..2aca1e93df 100644
--- a/po/de.po
+++ b/po/de.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-05-09 11:48+0800\n"
+"POT-Creation-Date: 2008-05-20 08:52+0800\n"
"PO-Revision-Date: 2006-07-28 19:32+0800\n"
"Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
"Language-Team: German <pspp-dev@gnu.org>\n"
@@ -197,12 +197,12 @@ msgstr "Spalten"
msgid "%s field) "
msgstr ""
-#: src/data/data-out.c:446
+#: src/data/data-out.c:447
#, c-format
msgid "Weekday number %f is not between 1 and 7."
msgstr ""
-#: src/data/data-out.c:467
+#: src/data/data-out.c:468
#, c-format
msgid "Month number %f is not between 1 and 12."
msgstr ""
@@ -450,7 +450,7 @@ msgstr "plotzlich ist der Datei beendet"
#. TRANSLATORS: this fragment will be interpolated into
#. messages in fh_lock() that identify types of files.
-#: src/data/por-file-reader.c:268 src/data/por-file-writer.c:148
+#: src/data/por-file-reader.c:268 src/data/por-file-writer.c:149
#, fuzzy
msgid "portable file"
msgstr "Tragbardatein (*.por)"
@@ -578,17 +578,17 @@ msgid ""
"Cannot assign value labels to %s and %s, which have different variable types."
msgstr ""
-#: src/data/por-file-writer.c:140
+#: src/data/por-file-writer.c:141
#, c-format
msgid "Invalid decimal digits count %d. Treating as %d."
msgstr ""
-#: src/data/por-file-writer.c:160
+#: src/data/por-file-writer.c:161
#, c-format
msgid "Error opening \"%s\" for writing as a portable file: %s."
msgstr ""
-#: src/data/por-file-writer.c:499
+#: src/data/por-file-writer.c:500
#, c-format
msgid "An I/O error occurred writing portable file \"%s\"."
msgstr ""
@@ -1162,7 +1162,7 @@ msgstr ""
msgid "This command may not follow ELSE in DO IF...END IF."
msgstr ""
-#: src/language/control/loop.c:213
+#: src/language/control/loop.c:216
msgid "Only one index clause may be specified."
msgstr ""
@@ -1582,19 +1582,19 @@ msgid ""
"specified on FIXCASE, %d."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:129
+#: src/language/data-io/inpt-pgm.c:130
msgid "Unexpected end-of-file within INPUT PROGRAM."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:142
+#: src/language/data-io/inpt-pgm.c:143
msgid "Input program did not create any variables."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:287
+#: src/language/data-io/inpt-pgm.c:288
msgid "COLUMN subcommand multiply specified."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:337
+#: src/language/data-io/inpt-pgm.c:338
msgid ""
"REREAD: Column numbers must be positive finite numbers. Column set to 1."
msgstr ""
@@ -2184,11 +2184,11 @@ msgstr ""
msgid "The weighting variable may not be scratch."
msgstr ""
-#: src/language/expressions/evaluate.c:154
+#: src/language/expressions/evaluate.c:155
msgid "expecting number or string"
msgstr ""
-#: src/language/expressions/evaluate.c:168
+#: src/language/expressions/evaluate.c:169
#, c-format
msgid "Duplicate variable name %s."
msgstr ""
@@ -4117,7 +4117,7 @@ msgstr ""
msgid "The filter variable may not be scratch."
msgstr ""
-#: src/libpspp/hash.c:614
+#: src/libpspp/hash.c:615
#, c-format
msgid "hash table:"
msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index 8786663dbd..e3eff412e6 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: pspp-dev@gnu.org\n"
-"POT-Creation-Date: 2008-05-09 11:48+0800\n"
+"POT-Creation-Date: 2008-05-20 08:52+0800\n"
"PO-Revision-Date: 2007-09-15 08:29+0800\n"
"Last-Translator: John Darrington <john@darrington.wattle.id.au>\n"
"Language-Team: John Darrington <john@darrington.wattle.id.au>\n"
@@ -194,12 +194,12 @@ msgstr ""
msgid "%s field) "
msgstr ""
-#: src/data/data-out.c:446
+#: src/data/data-out.c:447
#, c-format
msgid "Weekday number %f is not between 1 and 7."
msgstr ""
-#: src/data/data-out.c:467
+#: src/data/data-out.c:468
#, c-format
msgid "Month number %f is not between 1 and 12."
msgstr ""
@@ -445,7 +445,7 @@ msgstr ""
#. TRANSLATORS: this fragment will be interpolated into
#. messages in fh_lock() that identify types of files.
-#: src/data/por-file-reader.c:268 src/data/por-file-writer.c:148
+#: src/data/por-file-reader.c:268 src/data/por-file-writer.c:149
msgid "portable file"
msgstr ""
@@ -572,17 +572,17 @@ msgid ""
"Cannot assign value labels to %s and %s, which have different variable types."
msgstr ""
-#: src/data/por-file-writer.c:140
+#: src/data/por-file-writer.c:141
#, c-format
msgid "Invalid decimal digits count %d. Treating as %d."
msgstr ""
-#: src/data/por-file-writer.c:160
+#: src/data/por-file-writer.c:161
#, c-format
msgid "Error opening \"%s\" for writing as a portable file: %s."
msgstr ""
-#: src/data/por-file-writer.c:499
+#: src/data/por-file-writer.c:500
#, c-format
msgid "An I/O error occurred writing portable file \"%s\"."
msgstr ""
@@ -1154,7 +1154,7 @@ msgstr ""
msgid "This command may not follow ELSE in DO IF...END IF."
msgstr ""
-#: src/language/control/loop.c:213
+#: src/language/control/loop.c:216
msgid "Only one index clause may be specified."
msgstr ""
@@ -1573,19 +1573,19 @@ msgid ""
"specified on FIXCASE, %d."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:129
+#: src/language/data-io/inpt-pgm.c:130
msgid "Unexpected end-of-file within INPUT PROGRAM."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:142
+#: src/language/data-io/inpt-pgm.c:143
msgid "Input program did not create any variables."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:287
+#: src/language/data-io/inpt-pgm.c:288
msgid "COLUMN subcommand multiply specified."
msgstr ""
-#: src/language/data-io/inpt-pgm.c:337
+#: src/language/data-io/inpt-pgm.c:338
msgid ""
"REREAD: Column numbers must be positive finite numbers. Column set to 1."
msgstr ""
@@ -2175,11 +2175,11 @@ msgstr ""
msgid "The weighting variable may not be scratch."
msgstr ""
-#: src/language/expressions/evaluate.c:154
+#: src/language/expressions/evaluate.c:155
msgid "expecting number or string"
msgstr ""
-#: src/language/expressions/evaluate.c:168
+#: src/language/expressions/evaluate.c:169
#, c-format
msgid "Duplicate variable name %s."
msgstr ""
@@ -4108,7 +4108,7 @@ msgstr ""
msgid "The filter variable may not be scratch."
msgstr ""
-#: src/libpspp/hash.c:614
+#: src/libpspp/hash.c:615
#, c-format
msgid "hash table:"
msgstr ""
diff --git a/tests/bugs/compression.sh b/tests/bugs/compression.sh
index 885846eebb..71f9eab48d 100755
--- a/tests/bugs/compression.sh
+++ b/tests/bugs/compression.sh
@@ -22,6 +22,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/bugs/examine-missing2.sh b/tests/bugs/examine-missing2.sh
index ff07349577..965b600ee2 100755
--- a/tests/bugs/examine-missing2.sh
+++ b/tests/bugs/examine-missing2.sh
@@ -27,6 +27,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/bugs/freq-nolabels.sh b/tests/bugs/freq-nolabels.sh
index 68bbd425d2..b5c44b54ac 100755
--- a/tests/bugs/freq-nolabels.sh
+++ b/tests/bugs/freq-nolabels.sh
@@ -27,6 +27,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/bugs/print-crash.sh b/tests/bugs/print-crash.sh
index 08f9615f99..22b2156607 100755
--- a/tests/bugs/print-crash.sh
+++ b/tests/bugs/print-crash.sh
@@ -24,6 +24,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/bugs/signals.sh b/tests/bugs/signals.sh
index a2787f29c8..dedfc6c834 100755
--- a/tests/bugs/signals.sh
+++ b/tests/bugs/signals.sh
@@ -26,6 +26,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/bugs/t-test-alpha3.sh b/tests/bugs/t-test-alpha3.sh
index 25bd112555..ccfb70b9d7 100755
--- a/tests/bugs/t-test-alpha3.sh
+++ b/tests/bugs/t-test-alpha3.sh
@@ -27,6 +27,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/get-data-gnm.sh b/tests/command/get-data-gnm.sh
index 70cb24d136..746f1a6709 100755
--- a/tests/command/get-data-gnm.sh
+++ b/tests/command/get-data-gnm.sh
@@ -26,6 +26,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/get-data-psql.sh b/tests/command/get-data-psql.sh
index e47b5af711..fa61d6d684 100755
--- a/tests/command/get-data-psql.sh
+++ b/tests/command/get-data-psql.sh
@@ -31,6 +31,7 @@ cleanup()
return ;
fi
PGHOST=$TEMPDIR $pgpath/pg_ctl -D $TEMPDIR/cluster stop -W -o "-k $TEMPDIR -h ''" > /dev/null 2>&1
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/insert.sh b/tests/command/insert.sh
index ba4f543a79..354a54f898 100755
--- a/tests/command/insert.sh
+++ b/tests/command/insert.sh
@@ -26,6 +26,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/n_of_cases.sh b/tests/command/n_of_cases.sh
index 7c97e4458a..547135559f 100755
--- a/tests/command/n_of_cases.sh
+++ b/tests/command/n_of_cases.sh
@@ -27,6 +27,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/npar-binomial.sh b/tests/command/npar-binomial.sh
index 8c9a997136..63696929fa 100755
--- a/tests/command/npar-binomial.sh
+++ b/tests/command/npar-binomial.sh
@@ -26,6 +26,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/npar-chisquare.sh b/tests/command/npar-chisquare.sh
index 7ac52d0366..1df381b156 100755
--- a/tests/command/npar-chisquare.sh
+++ b/tests/command/npar-chisquare.sh
@@ -26,6 +26,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/print-strings.sh b/tests/command/print-strings.sh
index 4e1d98fa9e..5fb730063f 100755
--- a/tests/command/print-strings.sh
+++ b/tests/command/print-strings.sh
@@ -22,6 +22,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/rank.sh b/tests/command/rank.sh
index 03f000a93a..d98c8e2211 100755
--- a/tests/command/rank.sh
+++ b/tests/command/rank.sh
@@ -26,6 +26,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
diff --git a/tests/command/very-long-strings.sh b/tests/command/very-long-strings.sh
index d50abd9b98..8180f6bb2b 100755
--- a/tests/command/very-long-strings.sh
+++ b/tests/command/very-long-strings.sh
@@ -23,6 +23,7 @@ cleanup()
echo "NOT cleaning $TEMPDIR"
return ;
fi
+ cd /
rm -rf $TEMPDIR
}
--
2.30.2