# HG changeset patch
# User aidan
# Date 1196800851 0
# Node ID 2bb3630ea39778e611b495aa3af835450b57339f
# Parent  4ac3a83867c63483fe7ffa0080d3fc604bab9c20
[xemacs-hg @ 2007-12-04 20:40:49 by aidan]
Fix make check in the presence of variant language environments.

diff -r 4ac3a83867c6 -r 2bb3630ea397 tests/ChangeLog
--- a/tests/ChangeLog	Tue Dec 04 20:35:31 2007 +0000
+++ b/tests/ChangeLog	Tue Dec 04 20:40:51 2007 +0000
@@ -1,3 +1,10 @@
+2007-12-04  Aidan Kehoe  <kehoea@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@parhasard.net>
 
 	* automated/mule-tests.el:
diff -r 4ac3a83867c6 -r 2bb3630ea397 tests/automated/mule-tests.el
--- a/tests/automated/mule-tests.el	Tue Dec 04 20:35:31 2007 +0000
+++ b/tests/automated/mule-tests.el	Tue Dec 04 20:40:51 2007 +0000
@@ -548,6 +548,7 @@
   (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 @@
       (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)