CVS update by aidan xemacs/tests/automated ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/12/04 21:40:51

  Modified:    xemacs/tests/automated mule-tests.el
Log:
Fix make check in the presence of variant language environments.

Revision  Changes    Path
1.99      +7 -0      XEmacs/xemacs/tests/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -p -r1.98 -r1.99
--- ChangeLog	2007/11/29 13:37:51	1.98
+++ ChangeLog	2007/12/04 20:40:49	1.99
@@ -1,3 +1,10 @@
+2007-12-04  Aidan Kehoe  <kehoea at parhasard.net>
+
+	* automated/mule-tests.el (featurep):
+	The native coding system specified in the language environment can
+	be either a list (which we used to handle fine) or a single coding
+	system expression (which we failed on). Handle the latter case. 
+
 2007-11-29  Aidan Kehoe  <kehoea at parhasard.net>
 
 	* automated/mule-tests.el:



1.22      +7 -2      XEmacs/xemacs/tests/automated/mule-tests.el

Index: mule-tests.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/mule-tests.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- mule-tests.el	2007/11/29 13:38:21	1.21
+++ mule-tests.el	2007/12/04 20:40:51	1.22
@@ -548,6 +548,7 @@ This is a naive implementation in Lisp. 
   (loop
     for language in (mapcar #'car language-info-alist)
     with language-input-method = nil
+    with native-coding-system = nil
     do
     ;; s-l-e can call #'require, which says "Loading ..."
     (Silence-Message (set-language-environment language))
@@ -577,8 +578,12 @@ This is a naive implementation in Lisp. 
       (Assert (charsetp (find-charset charset))))
     (dolist (coding-system (get-language-info language 'coding-system))
       (Assert (coding-system-p (find-coding-system coding-system))))
-    (dolist (coding-system (get-language-info language
-                                              'native-coding-system))
+    (dolist (coding-system
+             (if (listp (setq native-coding-system
+                              (get-language-info language
+                                                 'native-coding-system)))
+                 native-coding-system
+               (list native-coding-system)))
       ;; We don't have the appropriate POSIX locales to test with a
       ;; native-coding-system that is a function.
       (unless (functionp coding-system)