The attached patch should fix this. This problem keeps comming back to bite us. So I've added a dist-hook which will test for this problem. In future, we could make this into a general linting script.
J'
On Thu, May 15, 2008 at 01:13:30PM -0400, Jason Stover wrote:
On Solaris 10, ten tests failed.
These tests failed:
tests/command/print-strings.sh
tests/bugs/compression.sh
tests/command/very-long-strings.sh
tests/bugs/print-crash.sh
..with this complain:
STAT_CONFIG_PATH=/web/web-users/jstover/src/pspp-0.6.0-pre3/config:
is
not an identifier
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://pgp.mit.edu or any PGP keyserver for public key.
? export.patch ? libtool ? pspp-0.4.3.tar.gz ? x ? doc/.dirstamp ? glade/.deps ? lib/gsl-extras/.deps ? lib/gsl-extras/.dirstamp ? lib/gtksheet/.deps ? lib/gtksheet/.dirstamp ? lib/linreg/.deps ? lib/linreg/.dirstamp ? po/pspp.pot ? po/remove-potcdate.sed ? src/data/.deps ? src/data/.dirstamp ? src/language/.deps ? src/language/.dirstamp ? src/language/control/.deps ? src/language/control/.dirstamp ? src/language/data-io/.deps ? src/language/data-io/.dirstamp ? src/language/dictionary/.deps ? src/language/dictionary/.dirstamp ? src/language/expressions/.deps ? src/language/expressions/.dirstamp ? src/language/lexer/.deps ? src/language/lexer/.dirstamp ? src/language/stats/.deps ? src/language/stats/.dirstamp ? src/language/stats/glm.c ? src/language/tests/.deps ? src/language/tests/.dirstamp ? src/language/tests/check-model.c ? src/language/utilities/.deps ? src/language/utilities/.dirstamp ? src/language/xforms/.deps ? src/language/xforms/.dirstamp ? src/libpspp/.deps ? src/libpspp/.dirstamp ? src/math/.deps ? src/math/.dirstamp ? src/math/linreg/.deps ? src/math/linreg/.dirstamp ? src/math/ts/.deps ? src/math/ts/.dirstamp ? src/output/.deps ? src/output/.dirstamp ? src/output/charts/.deps ? src/output/charts/.dirstamp ? src/ui/.deps ? src/ui/.dirstamp ? src/ui/gui/.deps ? src/ui/gui/.dirstamp ? src/ui/gui/.libs ? src/ui/gui/libpsppire.la ? src/ui/gui/src_ui_gui_libpsppire_la-glade-register.lo ? src/ui/terminal/.deps ? src/ui/terminal/.dirstamp ? tests/.deps ? tests/.dirstamp ? tests/.libs ? tests/dissect-sysfile ? tests/formats/.deps ? tests/formats/.dirstamp ? tests/libpspp/.deps ? tests/libpspp/.dirstamp ? tests/libpspp/abt-test ? tests/libpspp/bt-test ? tests/libpspp/heap-test ? tests/libpspp/range-map-test ? tests/libpspp/range-set-test ? tests/libpspp/sparse-array-test ? tests/libpspp/str-test ? tests/libpspp/tower-test Index: po/de.po =================================================================== RCS file: /sources/pspp/pspp/po/de.po,v retrieving revision 1.113 diff -U 3 -r1.113 de.po --- po/de.po 9 May 2008 07:06:36 -0000 1.113 +++ po/de.po 16 May 2008 09:58:17 -0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2008-05-09 11:48+0800\n" +"POT-Creation-Date: 2008-05-16 17:18+0800\n" "PO-Revision-Date: 2006-07-28 19:32+0800\n" "Last-Translator: John Darrington <[EMAIL PROTECTED]>\n" "Language-Team: German <[email protected]>\n" @@ -197,12 +197,12 @@ 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 @@ #. 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 @@ "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 @@ 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 @@ "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 @@ 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 @@ 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 "" Index: po/en_GB.po =================================================================== RCS file: /sources/pspp/pspp/po/en_GB.po,v retrieving revision 1.129 diff -U 3 -r1.129 en_GB.po --- po/en_GB.po 9 May 2008 07:06:36 -0000 1.129 +++ po/en_GB.po 16 May 2008 09:58:18 -0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PSPP 0.4.3\n" "Report-Msgid-Bugs-To: [EMAIL PROTECTED]" -"POT-Creation-Date: 2008-05-09 11:48+0800\n" +"POT-Creation-Date: 2008-05-16 17:18+0800\n" "PO-Revision-Date: 2007-09-15 08:29+0800\n" "Last-Translator: John Darrington <[EMAIL PROTECTED]>\n" "Language-Team: John Darrington <[EMAIL PROTECTED]>\n" @@ -194,12 +194,12 @@ 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 @@ #. 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 @@ "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 @@ 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 @@ "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 @@ 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 @@ 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 "" Index: tests/ChangeLog =================================================================== RCS file: /sources/pspp/pspp/tests/ChangeLog,v retrieving revision 1.127 diff -U 3 -r1.127 ChangeLog --- tests/ChangeLog 14 Apr 2008 17:34:36 -0000 1.127 +++ tests/ChangeLog 16 May 2008 09:58:19 -0000 @@ -1,3 +1,10 @@ +2008-05-16 John Darrington <[EMAIL PROTECTED]> + + * compression.sh print-crash.sh print-strings.sh very-long-strings.sh : + Removed export VAR=VAL syntax. + + * automake.mk: Added test to check for non-portable shell syntax + 2008-04-14 Jason Stover <[EMAIL PROTECTED]> * automake.mk: New test for regression with QR decomposition. Index: tests/automake.mk =================================================================== RCS file: /sources/pspp/pspp/tests/automake.mk,v retrieving revision 1.58 diff -U 3 -r1.58 automake.mk --- tests/automake.mk 14 Apr 2008 17:34:36 -0000 1.58 +++ tests/automake.mk 16 May 2008 09:58:19 -0000 @@ -311,3 +311,8 @@ CLEANFILES += *.save pspp.* foo* +dist-hook: + @if grep -q 'export .*=' $(dist_TESTS) ; then \ + echo 'One or more tests contain non-portable "export VAR=val" syntax' ; \ + false ; \ + fi Index: tests/bugs/compression.sh =================================================================== RCS file: /sources/pspp/pspp/tests/bugs/compression.sh,v retrieving revision 1.5 diff -U 3 -r1.5 compression.sh --- tests/bugs/compression.sh 25 Nov 2007 19:11:40 -0000 1.5 +++ tests/bugs/compression.sh 16 May 2008 09:58:19 -0000 @@ -12,7 +12,8 @@ top_builddir=`cd $top_builddir; pwd` PSPP=$top_builddir/src/ui/terminal/pspp -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() Index: tests/bugs/print-crash.sh =================================================================== RCS file: /sources/pspp/pspp/tests/bugs/print-crash.sh,v retrieving revision 1.3 diff -U 3 -r1.3 print-crash.sh --- tests/bugs/print-crash.sh 26 Aug 2007 18:35:47 -0000 1.3 +++ tests/bugs/print-crash.sh 16 May 2008 09:58:19 -0000 @@ -14,7 +14,8 @@ PSPP=$top_builddir/src/ui/terminal/pspp -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() Index: tests/command/print-strings.sh =================================================================== RCS file: /sources/pspp/pspp/tests/command/print-strings.sh,v retrieving revision 1.3 diff -U 3 -r1.3 print-strings.sh --- tests/command/print-strings.sh 26 Aug 2007 18:35:49 -0000 1.3 +++ tests/command/print-strings.sh 16 May 2008 09:58:20 -0000 @@ -12,7 +12,8 @@ top_builddir=`cd $top_builddir; pwd` PSPP=$top_builddir/src/ui/terminal/pspp -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup() Index: tests/command/very-long-strings.sh =================================================================== RCS file: /sources/pspp/pspp/tests/command/very-long-strings.sh,v retrieving revision 1.8 diff -U 3 -r1.8 very-long-strings.sh --- tests/command/very-long-strings.sh 26 Aug 2007 18:35:50 -0000 1.8 +++ tests/command/very-long-strings.sh 16 May 2008 09:58:21 -0000 @@ -13,7 +13,8 @@ top_builddir=`cd $top_builddir; pwd` PSPP=$top_builddir/src/ui/terminal/pspp -export STAT_CONFIG_PATH=$top_srcdir/config +STAT_CONFIG_PATH=$top_srcdir/config +export STAT_CONFIG_PATH cleanup()
signature.asc
Description: Digital signature
_______________________________________________ pspp-dev mailing list [email protected] http://lists.gnu.org/mailman/listinfo/pspp-dev
