--- a/tests/ChangeLog	Tue Dec 30 20:33:30 2008 +0000
+++ b/tests/ChangeLog	Sat Jan 03 15:24:14 2009 +0000
@@ -1,3 +1,14 @@
+2009-01-03  Aidan Kehoe  <kehoea@parhasard.net>
+
+	* automated/ccl-tests.el (ccl-test-setup): 
+	Use sane CCL programs for decoding and encoding with the test CCL
+	coding system by default. Correct a spelling in the docstring, add
+	a safe-chars property so that we don't confuse
+	query-coding-tests.el. 
+	(ccl-test-suites): 
+	Explicitly re-initialise the CCL programs for the test coding
+	system once finished. 
+
 2008-12-28  Aidan Kehoe  <kehoea@parhasard.net>
 
 	* automated/query-coding-tests.el: 

--- a/tests/automated/ccl-tests.el	Tue Dec 30 20:33:30 2008 +0000
+++ b/tests/automated/ccl-tests.el	Sat Jan 03 15:24:14 2009 +0000
@@ -117,21 +117,22 @@
 (defun ccl-test-setup ()
   (define-ccl-program
     ccl-test-decoder
-    '(1 (read r0)
-	(loop
-	  (write-read-repeat r0))))
+    '(1 (loop
+          (read r0)
+	  (write-repeat r0))))
   (define-ccl-program
     ccl-test-encoder
-    '(1 (read r0)
-	(loop
-	  (write-read-repeat r0))))
+    '(1 (loop
+          (read r0)
+	  (write-repeat r0))))
   (or (find-coding-system 'ccl-test-coding-system)
       (make-coding-system 
        'ccl-test-coding-system
        'ccl
-       "CCL TEST temprary coding-system."
+       "CCL TEST temporary coding-system."
        '(mnemonic "CCL-TEST"
 		  eol-type lf
+                  safe-chars t
 		  decode ccl-test-decoder
 		  encode ccl-test-encoder))))
 
@@ -601,7 +602,9 @@
   (ccl-test-simple-read-and-write)
   (ccl-test-read-write-multibyte-character)
   (ccl-test-ccl-call)
-  (ccl-test-map-instructions))
+  (ccl-test-map-instructions)
+  ;; Re-initialise the coding system:
+  (ccl-test-setup))
 
 ;;; start tests only when ccl-execute is enabled.
 (if (fboundp 'ccl-execute)