On Thu, May 15, 2008 at 01:13:30PM -0400, Jason Stover wrote:
     On Solaris 10, ten tests failed.
     
     For the following tests:
     
         format-guesser.sh
         tests/stats/moments.sh
         tests/expressions/expressions.sh
         tests/expressions/epoch.sh
     
     ...this output from some tests seems to cause diff to fail:
        
        Warning: cannot create a convertor for "ASCII" to "ASCII": Invalid 
argument

I think the attached patch should fix this.

J'

-- 
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.


? cv.patch
? export.patch
? libtool
? po.patch
? pspp-0.4.3.tar.gz
? pspp.jnl
? 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: src/libpspp/i18n.c
===================================================================
RCS file: /sources/pspp/pspp/src/libpspp/i18n.c,v
retrieving revision 1.11
diff -U 3 -r1.11 i18n.c
--- src/libpspp/i18n.c	6 Nov 2007 05:49:04 -0000	1.11
+++ src/libpspp/i18n.c	16 May 2008 10:51:27 -0000
@@ -46,7 +46,7 @@
 
   /* I don't think it's safe to translate this string or to use messaging
      as the convertors have not yet been set up */
-  if ( (iconv_t) -1 == conv)
+  if ( (iconv_t) -1 == conv && 0 != strcmp (tocode, fromcode))
     {
       const int err = errno;
       fprintf (stderr,

Attachment: signature.asc
Description: Digital signature

_______________________________________________
pspp-dev mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/pspp-dev

Reply via email to