emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/cpio-mode 4cc60b1 51/61: Version: 0.13β


From: Stefan Monnier
Subject: [elpa] externals/cpio-mode 4cc60b1 51/61: Version: 0.13β
Date: Fri, 11 Jan 2019 15:25:35 -0500 (EST)

branch: externals/cpio-mode
commit 4cc60b1fecc901984e48ddadaee8a3ca3eea06e4
Author: dlewan <address@hidden>
Commit: GitHub <address@hidden>

    Version: 0.13β
    
    Updates to meet ELPA conventions.
---
 DESIGN                      |  20 +-
 Makefile.in                 | 166 ++++++++-------
 NEWS                        |  26 ++-
 QUESTIONS                   |  22 +-
 README                      |  21 +-
 THANKS                      |  21 +-
 cab-test.el                 |  95 +++------
 configure.ac                |   8 +-
 cpio-affiliated-buffers.el  |  11 +-
 cpio-bin.el                 |  11 +-
 cpio-crc.el                 |  11 +-
 cpio-dired-crc-test.el      | 441 +++++++++++++++++++--------------------
 cpio-dired-odc-test.el      | 471 +++++++++++++++++++++---------------------
 cpio-dired-test.el          | 491 ++++++++++++++++++++++----------------------
 cpio-dired.el               |  30 +--
 cpio-entry-contents-mode.el |  11 +-
 cpio-entry-header.el        |  11 +-
 cpio-generic-tests.el       |   9 +-
 cpio-generic.el             |  71 +------
 cpio-hpbin.el               |  11 +-
 cpio-hpodc.el               |  11 +-
 cpio-modes-test.el          |   9 +-
 cpio-modes.el               |  11 +-
 cpio-newc.el                |  11 +-
 cpio-odc.el                 |  11 +-
 cpio-tar.el                 |   4 +-
 cpio-tests.el               |  21 +-
 cpio-ustar.el               |   6 +-
 cpio-wanted.el              |  11 +-
 cpio.el                     |  19 +-
 test-generic.el             | 122 ++++++++++-
 ttt.el                      |  71 ++++++-
 32 files changed, 1211 insertions(+), 1054 deletions(-)

diff --git a/DESIGN b/DESIGN
index 3038a3f..16f0c46 100644
--- a/DESIGN
+++ b/DESIGN
@@ -1,4 +1,22 @@
-#      $Id: DESIGN,v 1.5 2018/05/12 16:35:59 doug Exp $        
+#      $Id: DESIGN,v 1.6 2018/12/03 00:43:38 doug Exp $        
+
+# 
+# Copyright © 2015, 2017, 2018 Douglas Lewan, address@hidden
+# All rights reserved.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 
 A cpio entry basically looks like 
 an inode followed by contents of the specified length.
diff --git a/Makefile.in b/Makefile.in
index df1e2b2..d2eec85 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 # -*- mode: makefile; coding: utf-8 -*-
-#      $Id: Makefile.in,v 1.9 2018/12/02 00:13:07 doug Exp $   
+#      $Id: Makefile.in,v 1.11 2018/12/03 18:03:57 doug Exp $  
 
 # 
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 
@@ -60,6 +60,11 @@ TEST_FILES   =       cab-test.el                     \
                        cpio-dired-test.el              \
                        cpio-modes-test.el
 
+SUPPORT_FILES  =       cpio-affiliated-buffers.el      \
+                       cpio-generic.el                 \
+                       cpio-modes.el
+
+
 EL_FILES       =       ${APP_FILES} ${TEST_FILES} ${SUPPORT_FILES}
 LIB_FILES      =
 DOC_FILES      =
@@ -77,6 +82,8 @@ SRC_FILES     =       configure       \
                        THANKS          \
                        ${EL_FILES}
 
+subdirs                =       test_data/alphabet
+
 ################################
 # 
 # Where things are
@@ -98,6 +105,8 @@ infodir              =       @infodir@
 sharedir       =       ${prefix}/share/${PACKAGE}/${PACKAGE_VERSION}
 sharelibdir    =       ${sharedir}/lib
 sharelispdir   =       ${sharedir}/lisp
+srcdir         =       @srcdir@
+abs_srcdir     =       @abs_srcdir@
 
 
 ################################
@@ -137,7 +146,6 @@ BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \
 # EO stuff from emacs' lisp/Makefile.in
 ################################
 
-
 ################################################################
 
 ################################
@@ -148,115 +156,105 @@ BYTE_COMPILE_FLAGS = $(BIG_STACK_OPTS) \
 default:       check_gnu
        @echo 
        @echo "There is no default action in this Makefile."
-       @echo "Please type one of the following"
-       @for t in all check configure-default install uninstall dist help; do   
\
-               echo "    make $${t}" ;                 \
-       done
-       @echo 
+       ${MAKE} help
 
 help:  check_gnu
-       @echo "make all"
-       @echo "make check"
-       @echo "make configure-default"
-       @echo "make install"
-       @echo "make uninstall"
-       @echo "make dist        builds a tarball of this source tree."
-       @echo "make help        shows this help."
-       @echo "    Look in the parent directory for it."
-       @echo ""
-       @echo "make help        gets this help."
+       @echo "The Makefile has the following targets:"
+       @echo "    make check -- check_cab and check_modes."
+       @echo "    make check_cab -- run automated tests of 
cpio-affilitated-buffers.el."
+       @echo "    make check_copyrights -- scan files for copyrights."
+       @echo "    make check_modes -- run automated tests agains 
cpio-modes.el."
+       @echo "    make clean -- remove byte compiled files."
+       @echo "    make dist -- build a distributable tarball."
+       @echo "    make distclean -- clean, leaving only distribution files."
+       @echo "    make help -- present this help."
+       @echo "    make maintainer-clean -- clean and remove crufty files."
+       @echo "    make mostlyclean -- like distclean."
+       @echo "    make simple_install -- install the code for cpio-mode."
+       @echo "    make tags -- run tags on the cpio-mode source."
+       @echo "    make uninstall -- uninstall cpio-mode."
+       @echo "    make update_versions -- update the Version: fields in 
cpio-mode code."
+       @echo "    make version -- print the version of cpio-mode."
+       @echo "The following targets are incomplete, incorrect or just not 
implemented:"
+       @echo "    X make check -- run automated tests."
+       @echo "    X make elc -- byte compile cpio-mode."
+       @echo "    X make install -- install a byte compiled instance of 
cpio-mode."
+       @echo "    X make check_bin -- run automated tests of binary format 
handling."
+       @echo "    X make check_crc -- run automated tests of crc format 
handling."
+       @echo "    X make check_newc -- run automated tests of newc format 
handling."
+       @echo "    X make check_odc -- run automated tests of odc format 
handling."
 
 version:
        @echo ${PACKAGE} ${PACKAGE_VERSION}
 
 all:   default
 
-.PHONY:        check_gnu elc
+.PHONY:        check_gnu elc update_versions
 
 elc:   ${ELC_FILES}
 
 check_gnu:
        @${MAKE} --version >/dev/null 2>&1 || ( echo "This makefile requires 
GNU Make." && exit 1 )
 
+update_versions:       configure.ac
+       @for f in ${EL_FILES} ; do                                              
                                        \
+               sed -n -E -e 's/^;; Version: (.*)$$/;; Version: 
'${PACKAGE_VERSION}'/' -ep < $${f} >$${f}.tmp ;         \
+               mv -f $${f}.tmp $${f} ;                                         
                                        \
+       done
+
 ################################
 # 
 # Testing
 # 
 
-.PHONY: check check_cab installcheck
-check:
-       @for f in ${TEST_FILES} ; do                                            
                \
-               echo 
"################################################################" ;       \
-               echo "# "                                                       
        ;       \
-               echo "# Running tests in $${f}."                                
        ;       \
-               echo "# "                                                       
        ;       \
-               emacs -batch -Q -l ert -l $${f} -f ert-run-tests-batch-and-exit 
        ;       \
-               echo "# "                                                       
        ;       \
-               echo "# EO tests in $${f}."                                     
        ;       \
-               echo "# "                                                       
        ;       \
-               echo 
"################################################################" ;       \
-               echo ; echo ; echo                                              
        ;       \
-       done
+.PHONY: check check_cab check_bin check_crc check_newc check_odc installcheck
+check: check_cab check_modes # check_bin check_crc check_newc check_odc
+
+file_check:
+       @echo "################################################################"
+       @echo "# "
+       @echo "# Running tests in ${check_file}."
+       @echo "# "
+       emacs -batch -Q -eval "(setq load-path (add-to-list 'load-path 
\"${abs_srcdir}\"))" -l ert -l ${check_file} -f ert-run-tests-batch-and-exit 
2>&1 | grep -v -e 'Modification-flag cleared' -e 'Wrote /'
+       @echo "# "
+       @echo "# EO tests in ${check_file}."
+       @echo "# "
+       @echo "################################################################"
+       @echo ; echo ; echo 
 
 check_cab:
-       emacs -batch -Q -l ert -l cab-test.el -f ert-run-tests-batch-and-exit
-
+       make check_file=cab-test.el file_check
+check_modes:
+       make check_file=cpio-modes-test.el file_check
 check_bin:
-       @f="cpio-dired-bin-test.el" ;                                           
        \
-       echo "################################################################" 
;       \
-       echo "# "                                                               
;       \
-       echo "# Running tests in $${f}."                                        
;       \
-       echo "# "                                                               
;       \
-       emacs -batch -Q -l ert -l $${f} -f ert-run-tests-batch-and-exit         
;       \
-       echo "# "                                                               
;       \
-       echo "# EO tests in $${f}."                                             
;       \
-       echo "# "                                                               
;       \
-       echo "################################################################" 
;       \
-       echo ; echo ; echo                                                      
;       \
-
+       make check_file=cpio-dired-bin-test.el file_check
 check_crc:
-       @f="cpio-dired-crc-test.el" ;                                           
        \
-       echo "################################################################" 
;       \
-       echo "# "                                                               
;       \
-       echo "# Running tests in $${f}."                                        
;       \
-       echo "# "                                                               
;       \
-       emacs -batch -Q -l ert -l $${f} -f ert-run-tests-batch-and-exit         
;       \
-       echo "# "                                                               
;       \
-       echo "# EO tests in $${f}."                                             
;       \
-       echo "# "                                                               
;       \
-       echo "################################################################" 
;       \
-       echo ; echo ; echo                                                      
;       \
-
+       make check_file=cpio-dired-crc-test.el file_check
 check_newc:
-       @f="cpio-dired-test.el" ;                                               
        \
-       echo "################################################################" 
;       \
-       echo "# "                                                               
;       \
-       echo "# Running tests in $${f}."                                        
;       \
-       echo "# "                                                               
;       \
-       emacs -batch -Q -l ert -l $${f} -f ert-run-tests-batch-and-exit         
;       \
-       echo "# "                                                               
;       \
-       echo "# EO tests in $${f}."                                             
;       \
-       echo "# "                                                               
;       \
-       echo "################################################################" 
;       \
-       echo ; echo ; echo                                                      
;       \
-
+       make check_file=cpio-dired-test.el file_check
 check_odc:
-       @f="cpio-dired-odc-test.el" ;                                           
        \
-       echo "################################################################" 
;       \
-       echo "# "                                                               
;       \
-       echo "# Running tests in $${f}."                                        
;       \
-       echo "# "                                                               
;       \
-       emacs -batch -Q -l ert -l $${f} -f ert-run-tests-batch-and-exit         
;       \
-       echo "# "                                                               
;       \
-       echo "# EO tests in $${f}."                                             
;       \
-       echo "# "                                                               
;       \
-       echo "################################################################" 
;       \
-       echo ; echo ; echo                                                      
;       \
-
-
+       make check_file=cpio-dired-odc-test.el file_check
 
 installcheck: check
 
+.PHONY: check_copyrights
+check_copyrights: ${SRC_FILES}
+       @EXIT=0 ;                                                               
\
+       for f in ${SRC_FILES} ; do                                              
\
+               if grep -q -i copyright $${f} ; then                            
\
+                       : ;                                                     
\
+               else                                                            
\
+                       echo "$${f} looks like it is missing a copyright" ;     
\
+                       EXIT=1 ;                                                
\
+               fi ;                                                            
\
+       done ;                                                                  
\
+       exit ${EXIT}
+       pd=`pwd` ;                                                              
\
+       for d in ${subdirs} ; do                                                
\
+               cd $${d} ;                                                      
\
+               make check_copyrights ;                                         
\
+               cd $${pd} ;                                                     
\
+       done
 
 ################################
 # 
@@ -351,7 +349,7 @@ $(srcdir)/configure: configure.ac # aclocal.m4
 # autoheader might not change config.h.in, so touch a stamp file.
 $(srcdir)/config.h.in: stamp-h.in
 $(srcdir)/stamp-h.in: configure.ac # aclocal.m4
-       cd '$(srcdir)' && autoheader
+       cd '$(srcdir)' # && autoheader
        echo timestamp > '$(srcdir)/stamp-h.in'
 
 config.h: stamp-h
diff --git a/NEWS b/NEWS
index 7542be0..f1dfb91 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,29 @@
 # -*- outline -*-
-#      $Id: NEWS,v 1.14 2018/11/29 01:57:14 doug Exp $ 
+#      $Id: NEWS,v 1.15 2018/12/03 00:43:38 doug Exp $ 
+
+# 
+# Copyright © 2015, 2018 Douglas Lewan, address@hidden
+# All rights reserved.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
+
+* Version 0.13̱β
+** Clean up for publication to elpa.
+
+* Version 0.12β
+** Initial beta release.
 
 * Version 0.11
 ** Fixed a destructive-looking bug in cpio-affiliated-buffers.el.
diff --git a/QUESTIONS b/QUESTIONS
index 3c020ea..4457f46 100644
--- a/QUESTIONS
+++ b/QUESTIONS
@@ -1,5 +1,23 @@
 # -*- coding: utf-8 -*-
-#      $Id: QUESTIONS,v 1.4 2018/06/16 02:18:00 doug Exp $     
+#      $Id: QUESTIONS,v 1.5 2018/12/03 00:43:38 doug Exp $     
+
+# 
+# Copyright © 2018 Douglas Lewan, address@hidden
+# All rights reserved.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 
 cpio(1) related questions:
 • cpio(1) accepts block size on its command line.
@@ -41,3 +59,5 @@ Dired related questions:
 • How should I handle undo?
   Can you undo an entry's deletion?
   chown, etc.?
+
+Package related:
diff --git a/README b/README
index c0291ca..2693dc6 100644
--- a/README
+++ b/README
@@ -1,6 +1,23 @@
 # -*- mode: org; encoding: utf-8 -*-
-#      $Id: README,v 1.8 2018/11/19 21:25:37 doug Exp $        
-
+#      $Id: README,v 1.9 2018/12/03 00:43:38 doug Exp $        
+
+# 
+# Copyright © 2017, 2018 Douglas Lewan, address@hidden
+# All rights reserved.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 
 * Intent
 
diff --git a/THANKS b/THANKS
index 9f70ae6..b40cf44 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,22 @@
-#      $Id: THANKS,v 1.3 2018/06/03 14:01:54 doug Exp $        
+#      $Id: THANKS,v 1.4 2018/12/03 00:43:38 doug Exp $        
+
+# 
+# Copyright © 2018 Douglas Lewan, address@hidden
+# All rights reserved.
+# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 
 
 Thanks to the following people for helping me
 get cpio-mode up and running.
@@ -6,3 +24,4 @@ get cpio-mode up and running.
 Michael Albinus <address@hidden>, for pointing out similar functions now 
available in TRAMP.
 Sergey Poznyakoff <address@hidden>, for consultation about the structure of 
cpio archives.
 Sebastrian Kremer <address@hidden> et al., for providing the dired code that 
has guided me on occasion and performed fontification for me outright.
+Stefan Monnier <address@hidden> for help guiding me through the process of 
getting cpio-mode into ELPA.
diff --git a/cab-test.el b/cab-test.el
index ddec263..1fc184e 100644
--- a/cab-test.el
+++ b/cab-test.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cab-text.el --- brief description
-;      $Id: cab-test.el,v 1.8 2018/11/29 17:46:58 doug Exp $   
+;;; cab-test.el --- automated tests for cpio-affiliated-buffers. -*- coding: 
utf-8 -*-
+;      $Id: cab-test.el,v 1.10 2018/12/03 19:57:21 doug Exp $  
 
 ;; COPYRIGHT
 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <(address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Nov 22
-;; Version: 
-;; Keywords: 
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
@@ -73,19 +72,18 @@
   (let ((fname "cab-test-registry-1")
        (parent (get-buffer-create "r-1-p"))
        (child  (get-buffer-create "r-1-c")))
-    (message "%s(): Entering." fname)
-    (if (buffer-live-p parent)
-       (message "    Parent buffer is live.")
-      (message "    Parent buffer is NOT live."))
-    (if (buffer-live-p child)
-       (message "    Child buffer is live.")
-      (message "    Child buffer is NOT live."))
+    ;; (if (buffer-live-p parent)
+    ;;     (message "    Parent buffer is live.")
+    ;;   (message "    Parent buffer is NOT live."))
+    ;; (if (buffer-live-p child)
+    ;;     (message "    Child buffer is live.")
+    ;;   (message "    Child buffer is NOT live."))
     
     (cab-register child parent)
-    (message "parent of child is [[%s]]." (with-current-buffer child 
*cab-parent*))
-    (message "subordinates of child are [[%s]]." (with-current-buffer child 
*cab-subordinates*))
-    (message "parent of parent is [[%s]]." (with-current-buffer parent 
*cab-parent*))
-    (message "subordinates of parent are [[%s]]." (with-current-buffer parent 
*cab-subordinates*))
+    ;; (message "parent of child is [[%s]]." (with-current-buffer child 
*cab-parent*))
+    ;; (message "subordinates of child are [[%s]]." (with-current-buffer child 
*cab-subordinates*))
+    ;; (message "parent of parent is [[%s]]." (with-current-buffer parent 
*cab-parent*))
+    ;; (message "subordinates of parent are [[%s]]." (with-current-buffer 
parent *cab-subordinates*))
 
     (should (equal (with-current-buffer parent *cab-parent*)
                   nil))
@@ -94,8 +92,7 @@
     (should (equal (with-current-buffer child *cab-parent*)
                   parent))
     (should (equal (with-current-buffer child *cab-subordinates*)
-                  ()))
-    (message "%s(): Leaving." fname)))
+                  ()))))
 
 (ert-deftest cab-test-registry-2 ()
   "Tests registering two buffers under the same parent."
@@ -103,8 +100,6 @@
        (parent   (get-buffer-create "r-2-p2"))
        (buffer-1 (get-buffer-create "r-2-b21"))
        (buffer-2 (get-buffer-create "r-2-b22")))
-    (message "%s(): Entering." fname)
-
     (cab-register buffer-1 parent)
     (cab-register buffer-2 parent)
 
@@ -119,8 +114,7 @@
     (should (equal (with-current-buffer buffer-1 *cab-subordinates*)
                   ()))
     (should (equal (with-current-buffer buffer-2 *cab-subordinates*)
-                  ()))
-    (message "%s(): Leaving." fname)))
+                  ()))))
 
 (ert-deftest cab-test-registry-3 ()
   "Tests registering a 3 level hierarchy."
@@ -133,8 +127,6 @@
        (grandchild-313 (get-buffer-create "r-3-b313"))
        (grandchild-321 (get-buffer-create "r-3-b321"))
        (grandchild-322 (get-buffer-create "r-3-b322")))
-    (message "%s(): Entering." fname)
-    
     (cab-register parent-1       grandparent)
     (cab-register parent-2       grandparent)
     (cab-register grandchild-311 parent-1)
@@ -155,16 +147,13 @@
     (should (member grandchild-312 (with-current-buffer parent-1 
*cab-subordinates*)))
     (should (member grandchild-313 (with-current-buffer parent-1 
*cab-subordinates*)))
     (should (member grandchild-321 (with-current-buffer parent-2 
*cab-subordinates*)))
-    (should (member grandchild-322 (with-current-buffer parent-2 
*cab-subordinates*)))
-    (message "%s(): Leaving." fname)))
+    (should (member grandchild-322 (with-current-buffer parent-2 
*cab-subordinates*)))))
 
 (ert-deftest cab-test-deregister-1 ()
   "Test deregistering the registry established in (cab-test-registry-1)."
   (let ((fname "cab-test-registry-1")
        (parent (get-buffer-create "dr-1-p1"))
        (buffer (get-buffer-create "dr-1-b2")))
-    (message "%s(): Entering." fname)
-    
     (cab-register buffer parent)
     (cab-deregister buffer)
     
@@ -178,8 +167,7 @@
     (cab-register buffer parent)
     (cab-deregister parent)
     (should-not (buffer-live-p parent))
-    (should-not (cab-registered-p buffer parent))
-    (message "%s(): Leaving." fname)))
+    (should-not (cab-registered-p buffer parent))))
 
 (ert-deftest cab-test-deregister-2 ()
   "Test deregistering the registry established in (cab-test-registry-2)."
@@ -187,8 +175,6 @@
        (parent   (get-buffer-create "dr-2-p2"))
        (buffer-1 (get-buffer-create "dr-2-b21"))
        (buffer-2 (get-buffer-create "dr-2-b22")))
-    (message "%s(): Entering." fname)
-
     (cab-register buffer-1 parent)
     (cab-register buffer-2 parent)
     (cab-deregister buffer-1)
@@ -214,9 +200,7 @@
     (should-not (cab-registered-p buffer-1 parent))
 
     (should-not (buffer-live-p buffer-2))
-    (should-not (cab-registered-p buffer-2 parent))
-
-    (message "%s(): Leaving." fname)))
+    (should-not (cab-registered-p buffer-2 parent))))
 
 (ert-deftest cab-test-deregister-3 ()
   "Test deregistering the registry established in (cab-test-registry-3)."
@@ -229,8 +213,6 @@
        (grandchild-313 (get-buffer-create "dr-3-b313"))
        (grandchild-321 (get-buffer-create "dr-3-b321"))
        (grandchild-322 (get-buffer-create "dr-3-b322")))
-    (message "%s(): Entering." fname)
-
     (cab-register parent-1       grandparent)
     (cab-register parent-2       grandparent)
     (cab-register grandchild-311 parent-1)
@@ -276,9 +258,7 @@
                grandchild-312
                grandchild-313
                grandchild-321
-               grandchild-322))
-
-    (message "%s(): Leaving." fname)))
+               grandchild-322))))
 
 (ert-deftest cab-test-kill-1 ()
   "Tests killing in the hierarchy created in (cab-test-registry-1)."
@@ -286,20 +266,8 @@
   (let ((fname "cab-test-kill-1")
        (parent (get-buffer-create "k-1-p1"))
        (child  (get-buffer-create "k-1-b2")))
-    (cdmt-message "%s(): Entering." fname)
-
-    (should (cond ((buffer-live-p parent)
-                  (cdmt-message "    Parent buffer is live.")
-                  t)
-                 (t
-                  (cdmt-message "    Parent buffer is not live!")
-                  nil)))
-    (should (cond ((buffer-live-p child)
-                  (cdmt-message "    Child buffer is live.")
-                  t)
-                 (t
-                  (cdmt-message "    Child buffer is not live!")
-                  nil)))
+    (should (buffer-live-p parent))
+    (should (buffer-live-p child))
 
     (cab-register child parent)
     (kill-buffer child)
@@ -321,9 +289,7 @@
     (should-not (if (buffer-live-p parent)
                    (with-current-buffer parent
                      (member child *cab-subordinates*))
-                 nil))
-                 
-    (cdmt-message "%s(): Leaving." fname)))
+                 nil))))
 
 (ert-deftest cab-test-kill-2 ()
   "Tests killing in the hierarchy established in (cab-test-registry-2)."
@@ -331,8 +297,6 @@
        (parent  (get-buffer-create "k-2-p2"))
        (child-1 (get-buffer-create "k-2-b21"))
        (child-2 (get-buffer-create "k-2-b22")))
-    (cdmt-message "%s(): Entering." fname)
-
     (cab-register child-1 parent)
     (cab-register child-2 parent)
 
@@ -365,9 +329,7 @@
     (kill-buffer parent)
 
     (should-not (buffer-live-p parent))
-    (should     (buffer-live-p child-1))
-
-    (cdmt-message "%s(): Leaving." fname)))
+    (should     (buffer-live-p child-1))))
 
 (ert-deftest cab-test-kill-3 ()
   "Test killing a 3 level hierarchy."
@@ -380,8 +342,6 @@
        (grandchild-313 (get-buffer-create "k-3-b313"))
        (grandchild-321 (get-buffer-create "k-3-b321"))
        (grandchild-322 (get-buffer-create "k-3-b322")))
-    (cdmt-message "%s(): Entering." fname)
-
     (cab-register parent-1       grandparent)
     (cab-register parent-2       grandparent)
     (cab-register grandchild-311 parent-1)
@@ -469,10 +429,7 @@
       (should-not (buffer-live-p grandchild-312))
       (should     (buffer-live-p grandchild-313))
       (should     (buffer-live-p grandchild-321))
-      (should-not (buffer-live-p grandchild-322))
-
-      ;; This bothers the byte compiler for some reason.
-      (cdmt-message "%s(): Leaving." fname))))
+      (should-not (buffer-live-p grandchild-322)))))
 
 (ert-deftest cab-test-register-negatively-0 ()
   "Test of the things that (cab-register) should not do.
diff --git a/configure.ac b/configure.ac
index 968efb9..27368ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-dnl    $Id: configure.ac,v 1.13 2018/12/02 00:13:07 doug Exp $ 
+dnl    $Id: configure.ac,v 1.15 2018/12/03 18:03:58 doug Exp $ 
 
 # 
 # Copyright © 2015, 2017, 2018 Douglas Lewan, address@hidden
@@ -20,8 +20,9 @@ dnl   $Id: configure.ac,v 1.13 2018/12/02 00:13:07 doug Exp $
 # 
 
 dnl Autoconf requirements
-AC_INIT(cpio-mode, 0.12β, address@hidden)
+AC_INIT(cpio-mode, 0.13β, address@hidden)
 AC_PREFIX_DEFAULT(${HOME}/local)
+
 dnl information on the package
 dnl checks for programs
 
@@ -61,7 +62,8 @@ dnl checks for compiler characteristics
 dnl checks for library functions
 dnl checks for system services
 AC_CONFIG_FILES([Makefile
-                stamp-h],
+                stamp-h
+                test_data/alphabet/Makefile],
                 [echo timestamp > stamp-h])
 AC_OUTPUT
 
diff --git a/cpio-affiliated-buffers.el b/cpio-affiliated-buffers.el
index 6158889..7c98763 100644
--- a/cpio-affiliated-buffers.el
+++ b/cpio-affiliated-buffers.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-affiliated-buffers.el --- Establish and manage buffers affiliated 
with each other.
-;      $Id: cpio-affiliated-buffers.el,v 1.9 2018/11/29 01:57:14 doug Exp $    
+;;; cpio-affiliated-buffers.el --- Establish and manage buffers affiliated 
with each other. -*- coding: utf-8 -*-
+;      $Id: cpio-affiliated-buffers.el,v 1.11 2018/12/03 19:57:21 doug Exp $   
 
 ;; COPYRIGHT
 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Nov 22
-;; Version: 
-;; Keywords: 
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-bin.el b/cpio-bin.el
index 56a1fe0..3f7f58e 100644
--- a/cpio-bin.el
+++ b/cpio-bin.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-bin.el --- handle bin cpio entry header formats
-;      $Id: cpio-bin.el,v 1.13 2018/12/02 00:13:07 doug Exp $  
+;;; cpio-bin.el --- handle bin cpio entry header formats -*- coding: utf-8 -*-
+;      $Id: cpio-bin.el,v 1.15 2018/12/03 19:57:21 doug Exp $  
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, binary header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-crc.el b/cpio-crc.el
index b6035b7..081b967 100644
--- a/cpio-crc.el
+++ b/cpio-crc.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-crc.el --- handle crc cpio entry header formats
-;      $Id: cpio-crc.el,v 1.14 2018/12/02 00:13:07 doug Exp $  
+;;; cpio-crc.el --- handle crc cpio entry header formats -*- coding: utf-8 -*-
+;      $Id: cpio-crc.el,v 1.16 2018/12/03 19:57:21 doug Exp $  
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, crc header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-dired-crc-test.el b/cpio-dired-crc-test.el
index 70125ae..a337f68 100644
--- a/cpio-dired-crc-test.el
+++ b/cpio-dired-crc-test.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-dired-crc-test.el --- brief description
-;      $Id: cpio-dired-crc-test.el,v 1.12 2018/11/29 17:46:58 doug Exp $       
+;;; cpio-dired-crc-test.el --- Tests of cpio-dired-mode for crc archives. -*- 
coding: utf-8 -*-
+;      $Id: cpio-dired-crc-test.el,v 1.15 2018/12/03 19:57:21 doug Exp $       
 
 ;; COPYRIGHT
 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2018 May 16
-;; Version: 0.01
-;; Keywords: cpio, crc format, dired
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
@@ -37,10 +36,10 @@
 ;; 
 (load (concat default-directory "test-generic.el"))
 
-(eval-when-compile
-  (if (file-exists-p (concat default-directory "cpio.elc"))
-      (load (concat default-directory "cpio.elc")))
-  (load (concat default-directory "cpio.el")))
+(setq load-path (add-to-list 'load-path default-directory))
+(if (file-exists-p (concat default-directory "cpio.elc"))
+    (load (concat default-directory "cpio.elc")))
+(load (concat default-directory "cpio.el"))
 
 ;;;;;;;;;;;;;;;;
 ;; Things to make the byte compiler happy.
@@ -6801,9 +6800,9 @@ then the entry names will be incorrect."
 
     (cpio-dired-kill)
 
-    (message "%s(): Dired style buffer should not be live." test-name)
+    (cdmt-message "%s(): Dired style buffer should not be live." test-name)
     (should (not (buffer-live-p cpio-dired-buffer)))
-    (message "%s(): Archive buffer should not be live." test-name)
+    (cdmt-message "%s(): Archive buffer should not be live." test-name)
     (should (not (buffer-live-p cpio-archive-buffer)))))
 
 (ert-deftest cdmt-crc-cpio-dired-do-isearch ()
@@ -8742,17 +8741,17 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
     (with-current-buffer cpio-dired-buffer
       ;;(should (and "Viewing an entry should not change the archive buffer."
       (should     (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Viewing an entry should not change the dired-style 
buffer." test-name)
+      (cdmt-message "%s(): Viewing an entry should not change the dired-style 
buffer." test-name)
       (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-      (message "%s(): The contents buffer should not be null." test-name)
+      (cdmt-message "%s(): The contents buffer should not be null." test-name)
       (should (not (null cpio-contents-buffer)))
-      (message "%s(): The contents buffer should be live." test-name)
+      (cdmt-message "%s(): The contents buffer should be live." test-name)
       (should (buffer-live-p cpio-contents-buffer))
-      (message "%s(): Check the entry's contents buffer." test-name)
+      (cdmt-message "%s(): Check the entry's contents buffer." test-name)
       (should (string-equal cpio-contents-buffer-string "\naaa\n\n"))
-      (message "%s(): The entry's contents' window should be live." test-name)
+      (cdmt-message "%s(): The entry's contents' window should be live." 
test-name)
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting no change to the catalog." test-name)
+      (cdmt-message "%s(): Expecting no change to the catalog." test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (cdmt-reset)
@@ -8779,15 +8778,15 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
             (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog))))
 
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Checking the archive buffer." test-name)
+      (cdmt-message "%s(): Checking the archive buffer." test-name)
       (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Checking the dired-style buffer." test-name)
+      (cdmt-message "%s(): Checking the dired-style buffer." test-name)
       (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting no change to the catalog." test-name)
+      (cdmt-message "%s(): Expecting no change to the catalog." test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-crc-cpio-dired-do-async-shell-command ()
@@ -8820,9 +8819,9 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                 (with-current-buffer cpio-dired-buffer
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
-    (message "%s(): Expecting an unchanged archive. (8814)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive. (8814)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting 'a' to have group 9999." test-name)
+    (cdmt-message "%s(): Expecting 'a' to have group 9999." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  9999        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8845,7 +8844,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting entry »a« to have group 9999 in the catalog." 
test-name)
+    (cdmt-message "%s(): Expecting entry »a« to have group 9999 in the 
catalog." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -8952,9 +8951,9 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer doesn't change until saving." test-name)
+    (cdmt-message "%s(): The archive buffer doesn't change until saving." 
test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting the first 4 entries to have group 8888." 
test-name)
+    (cdmt-message "%s(): Expecting the first 4 entries to have group 8888." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  8888        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8977,7 +8976,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with the first 3 entries having group 
8888." test-name)
+    (cdmt-message "%s(): Expecting a catalog with the first 3 entries having 
group 8888." test-name)
     (should (string-match"((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9085,9 +9084,9 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive is not changed until saved. (8894)" test-name)
+    (cdmt-message "%s(): The archive is not changed until saved. (8894)" 
test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting \`...\' to have group 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have group 7777." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9110,7 +9109,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to have group 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have group 7777." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9229,10 +9228,10 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting the first entry to have mode -rwxr-xr-x." 
test-name)
+    (cdmt-message "%s(): Expecting the first entry to have mode -rwxr-xr-x." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
-  -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
+  -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
@@ -9252,7 +9251,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a mode of 0755 on the first entry." test-name)
+    (cdmt-message "%s(): Expecting a mode of 0755 on the first entry." 
test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -9586,7 +9585,7 @@ TRAILER!!!        (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a mode of 0755 (33261) on the first entry." 
test-name)
+    (cdmt-message "%s(): Expecting a mode of 0755 (33261) on the first entry." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9692,8 +9691,8 @@ TRAILER!!!        (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting aaa, aaaa, aaaaa to have mode -rw------." 
test-name)
-    (message "%s(): Expecting aaaaa.d to have mode dr--------." test-name)
+    (cdmt-message "%s(): Expecting aaa, aaaa, aaaaa to have mode -rw------." 
test-name)
+    (cdmt-message "%s(): Expecting aaaaa.d to have mode dr--------." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9716,12 +9715,12 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
-    (message "%s(): The archive is not modified until saving." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): The archive is not modified until saving." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting aaa, aaaa, aaaaa to have mode 0100600 (33152)." 
test-name)
-    (message "%s(): Expecting aaaaa.d to have mode 040600 (16768)." test-name)
+    (cdmt-message "%s(): Expecting aaa, aaaa, aaaaa to have mode 0100600 
(33152)." test-name)
+    (cdmt-message "%s(): Expecting aaaaa.d to have mode 040600 (16768)." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9827,7 +9826,7 @@ TRAILER!!!        (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting ... to have mode -rw-rw----." test-name)
+    (cdmt-message "%s(): Expecting ... to have mode -rw-rw----." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9850,10 +9849,10 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting ... to have mode 0100660 (33200)." test-name)
+    (cdmt-message "%s(): Expecting ... to have mode 0100660 (33200)." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9957,11 +9956,11 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting all the above mode changes in the archive 
buffer." test-name)
-    (message "%s(): • a has mode 0100755 (000081ED)." test-name)
-    (message "%s(): • aaa, aaaa, aaaaa have mode 0100600 (00008180)." 
test-name)
-    (message "%s(): • aaaaa.d has mode 040600 (00004180)." test-name)
-    (message "%s(): • ... have mode 0660 (000081B0 for files or 000041B0 for 
directories)." test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the archive 
buffer." test-name)
+    (cdmt-message "%s(): • a has mode 0100755 (000081ED)." test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa have mode 0100600 (00008180)." 
test-name)
+    (cdmt-message "%s(): • aaaaa.d has mode 040600 (00004180)." test-name)
+    (cdmt-message "%s(): • ... have mode 0660 (000081B0 for files or 000041B0 
for directories)." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081ED       (( mode     ))
@@ -10295,10 +10294,10 @@ TRAILER!!!    (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting all the above mode changes in the dired buffer." 
test-name)
-    (message "%s(): • a has mode -rwxr-xr-x" test-name)
-    (message "%s(): • aaa, aaaa, aaaaa, aaaaa.d have mode -rw-r--r--" 
test-name)
-    (message "%s(): • ... have mode -rw-rw----" test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the dired 
buffer." test-name)
+    (cdmt-message "%s(): • a has mode -rwxr-xr-x" test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa, aaaaa.d have mode -rw-r--r--" 
test-name)
+    (cdmt-message "%s(): • ... have mode -rw-rw----" test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10321,12 +10320,12 @@ TRAILER!!!    (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting all the above mode changes in the catalog." 
test-name)
-    (message "%s(): • a has mode 33261." test-name)
-    (message "%s(): • aaa, aaaa, aaaaa have mode 33152." test-name)
-    (message "%s(): • aaaaa.d has mode 16768." test-name)
-    (message "%s(): • ... have mode 33200 for files." test-name)
-    (message "%s():                 16816 for directories." test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the catalog." 
test-name)
+    (cdmt-message "%s(): • a has mode 33261." test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa have mode 33152." test-name)
+    (cdmt-message "%s(): • aaaaa.d has mode 16768." test-name)
+    (cdmt-message "%s(): • ... have mode 33200 for files." test-name)
+    (cdmt-message "%s():                 16816 for directories." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10445,10 +10444,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (10741)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(10741)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with the owner of 'a' being 
9999." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with the owner of 'a' 
being 9999." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  9999  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10471,7 +10470,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): The owner of 'a' should be 9999." test-name)
+    (cdmt-message "%s(): The owner of 'a' should be 9999." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10579,10 +10578,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (11111)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(11111)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888." test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10605,7 +10604,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting 4 catalog entries with owner 8888." test-name)
+    (cdmt-message "%s(): Expecting 4 catalog entries with owner 8888." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10713,10 +10712,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (10818)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(10818)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to be owned by 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to be owned by 7777." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10739,7 +10738,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting ... to be owned by 7777." test-name)
+    (cdmt-message "%s(): Expecting ... to be owned by 7777." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10858,10 +10857,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (17974)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17974)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting entry 'a' to have owner 9999 and group 1111." 
test-name)
+    (cdmt-message "%s(): Expecting entry 'a' to have owner 9999 and group 
1111." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  9999  1111        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10884,7 +10883,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting entry 'a' to have owner 9999 and group 1111." 
test-name)
+    (cdmt-message "%s(): Expecting entry 'a' to have owner 9999 and group 
1111." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 9999 1111 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10992,9 +10991,9 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive. (9918)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (9918)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11017,7 +11016,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11125,9 +11124,9 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive. (9958)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (9958)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive*  
cpio-archive-buffer-contents))
-    (message "%s(): Expecting \`...\' to have owner 7777 and group 3333." 
test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have owner 7777 and group 3333." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11150,7 +11149,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting ... to have owner 7777 and group 3333." 
test-name)
+    (cdmt-message "%s(): Expecting ... to have owner 7777 and group 3333." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11275,7 +11274,7 @@ cpio-dired-do-compress is not yet implemented -- expect 
an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Checking that entry »a« has been copied to »d«."  
test-name)
+    (cdmt-message "%s(): Checking that entry »a« has been copied to »d«."  
test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -11612,7 +11611,7 @@ a
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Checking that there is an entry »d« in the dired style 
buffer." test-name)
+    (cdmt-message "%s(): Checking that there is an entry »d« in the dired 
style buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11636,7 +11635,7 @@ a
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to see an entry »d«." test-name)
+    (cdmt-message "%s(): Expecting to see an entry »d«." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11762,7 +11761,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Checking for »aaa«, »aaaa«, »aaaaa«, »aaaaa« copied to 
newDirectory in the archive." test-name)
+    (cdmt-message "%s(): Checking for »aaa«, »aaaa«, »aaaaa«, »aaaaa« copied 
to newDirectory in the archive." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -12150,7 +12149,7 @@ aaa
 \\0\\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Checking for the presence of »newDirectory/aaa«, 
»newDirectory/aaaa«, »newDirectory/aaaaa«, »newDirectory/aaaaa«." test-name)
+    (cdmt-message "%s(): Checking for the presence of »newDirectory/aaa«, 
»newDirectory/aaaa«, »newDirectory/aaaaa«, »newDirectory/aaaaa«." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -12315,7 +12314,7 @@ c -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with each 3 letter entry copied to 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting an archive with each 3 letter entry copied 
to newDirectory-1." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -12688,7 +12687,7 @@ aaa
 \\0\\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with ... under 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with ... under 
newDirectory-1." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -12714,7 +12713,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to see ... entries in newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting to see ... entries in newDirectory-1." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -12849,7 +12848,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with each entry named with at least 3 
letters copied to newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting an archive with each entry named with at 
least 3 letters copied to newDirectory-3." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -13375,7 +13374,7 @@ aaa
 \\0\\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting all entries named with at least 3 letters 
to have copies in newDirectory-3." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -13410,7 +13409,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting all entries named with at least 3 letters 
to have copies in newDirectory-3." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -13594,7 +13593,7 @@ cpio-dired-do-copy-regexp is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting entry »a« to be deleted." test-name)
+    (cdmt-message "%s(): Expecting entry »a« to be deleted." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -13910,7 +13909,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting entry »a« to be deleted." test-name)
+    (cdmt-message "%s(): Expecting entry »a« to be deleted." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -13932,7 +13931,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entry »a« deleted." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entry »a« deleted." 
test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14032,7 +14031,7 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting sn archive with 4 entries deleted." test-name)
+    (cdmt-message "%s(): Expecting sn archive with 4 entries deleted." 
test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -14279,7 +14278,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 4 more consecutive deletions." test-name)
+    (cdmt-message "%s(): Expecting 4 more consecutive deletions." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -14297,8 +14296,8 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entries" test-name)
-    (message "%s():     »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entries" test-name)
+    (cdmt-message "%s():     »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted." 
test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14379,7 +14378,7 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with ... deleted." test-name)
+    (cdmt-message "%s(): Expecting an archive with ... deleted." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -14572,7 +14571,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with ... deleted." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with ... deleted." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -14587,7 +14586,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with further entries \`...\' deleted." 
test-name)
+    (cdmt-message "%s(): Expecting a catalog with further entries \`...\' 
deleted." test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14707,11 +14706,11 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive." test-name)
-    (message "%s(): The archive gets updated on save." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): The archive gets updated on save." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired buffer with no entry »a«, but an entry 
»d«." test-name)
+    (cdmt-message "%s(): Expecting a dired buffer with no entry »a«, but an 
entry »d«." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14734,7 +14733,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting catalog with first entry »d«." test-name)
+    (cdmt-message "%s(): Expecting catalog with first entry »d«." test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14840,10 +14839,10 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an as yet unchanged archive." test-name)
+    (cdmt-message "%s(): Expecting an as yet unchanged archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired style buffer with entries »aaaa«, 
»aaaaa«, »aaaaa.d« and »b« moved to »newDirectory«." test-name)
+    (cdmt-message "%s(): Expecting a dired style buffer with entries »aaaa«, 
»aaaaa«, »aaaaa.d« and »b« moved to »newDirectory«." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14866,7 +14865,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with the above changes." test-name)
+    (cdmt-message "%s(): Expecting a catalog with the above changes." 
test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14972,10 +14971,10 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an as yet unchanged archive." test-name)
+    (cdmt-message "%s(): Expecting an as yet unchanged archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired buffer with \`...\' all under 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a dired buffer with \`...\' all under 
newDirectory-1." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14998,7 +14997,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with \`...\' entries in 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a catalog with \`...\' entries in 
newDirectory-1." test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -15188,14 +15187,14 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
 
 
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Expect an untouched archive. (17975)" test-name)
+      (cdmt-message "%s(): Expect an untouched archive. (17975)" test-name)
       (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
       (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n")))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting an unchanged catalog. (17949)" test-name)
+      (cdmt-message "%s(): Expecting an unchanged catalog. (17949)" test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (push entry-name past-entries)
@@ -15221,14 +15220,14 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                     (buffer-substring-no-properties (point-min) 
(point-max))))))
 
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Expect an untouched archive. (17976)" test-name)
+      (cdmt-message "%s(): Expect an untouched archive. (17976)" test-name)
       (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
       (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting an unchanged catalog. (17950)" test-name)
+      (cdmt-message "%s(): Expecting an unchanged catalog. (17950)" test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     ;; Now make sure that any past entries are still there.
@@ -15284,9 +15283,9 @@ cpio-dired-find-entry-other-window is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with autosave entries" test-name)
-    (message "%s(): for each single character entry." test-name)
-    (message "%s(): (The copy used to create them must update the archive.)" 
test-name)
+    (cdmt-message "%s(): Expecting an archive with autosave entries" test-name)
+    (cdmt-message "%s(): for each single character entry." test-name)
+    (cdmt-message "%s(): (The copy used to create them must update the 
archive.)" test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -15659,7 +15658,7 @@ c
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with single character backup 
files." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with single character 
backup files." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15685,7 +15684,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #c
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with autosave entries for single 
character names." test-name)
+    (cdmt-message "%s(): Expecting a catalog with autosave entries for single 
character names." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -15828,9 +15827,9 @@ cpio-dired-flag-entries-regexp is not yet implemented 
-- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (17977)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17977)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with one entry flagged for 
deletion." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with one entry flagged 
for deletion." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15853,7 +15852,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17951)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17951)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -15868,10 +15867,10 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (17978)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17978)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with 4 entries flagged for 
deletion." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with 4 entries flagged 
for deletion." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15894,7 +15893,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17952)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17952)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-flag-garbage-entries ()
@@ -15926,8 +15925,8 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with entries for suffixes" test-name)
-    (message "%s():     aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting an archive with entries for suffixes" 
test-name)
+    (cdmt-message "%s():     aux bak dvi log orig reg toc." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -16372,9 +16371,9 @@ aa
 \\0\\0\\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired-style buffer with marked entries" 
test-name)
-    (message "    %s(): for the suffixes" test-name)
-    (message "    %s(): aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with marked entries" 
test-name)
+    (cdmt-message "    %s(): for the suffixes" test-name)
+    (cdmt-message "    %s(): aux bak dvi log orig reg toc." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16404,8 +16403,8 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa.toc
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entries with the suffixes" 
test-name)
-    (message "%s(): aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entries with the suffixes" 
test-name)
+    (cdmt-message "%s(): aux bak dvi log orig reg toc." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -16582,10 +16581,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (17979)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17979)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with one entry marked." 
test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with one entry marked." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16608,7 +16607,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17953)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17953)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16623,9 +16622,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged small archive. (17986)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged small archive. (17986)" 
test-name)
     (should (string-equal cpio-archive-buffer-contents 
*cdmt-crc-untouched-small-archive*))
-    (message "%s(): Expecting 4 more marks in a cpio-dired buffer." test-name)
+    (cdmt-message "%s(): Expecting 4 more marks in a cpio-dired buffer." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16648,7 +16647,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17954)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17954)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-mark-directories ()
@@ -16664,6 +16663,8 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                :type 'error))
 
 (ert-deftest cdmt-crc-cpio-dired-mark-entries-regexp () ;✓
+  "Test cpio-dired-mark-entries-regexp."
+  :tags '(:expensive-test)
   (let ((test-name "cdmt-crc-cpio-dired-mark-entries-regexp")
         (cpio-archive-buffer)
         (cpio-archive-buffer-contents)
@@ -16685,10 +16686,10 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (17980)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17980)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with ... marked." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with ... marked." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16711,7 +16712,7 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17955)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17955)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-mark-executables ()
@@ -16763,13 +16764,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be aaaaa.d" test-name)
+    (cdmt-message "%s(): The current entry should be aaaaa.d" test-name)
     (should (string-equal "aaaaa.d" entry-name))
-    (message "%s(): Expecting an untouched large archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an untouched large archive buffer." 
test-name)
     (should (string-equal *cdmt-crc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched." test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched." 
test-name)
     (should (string-match *cdmt-crc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16784,13 +16785,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ccccc.d" test-name)
+    (cdmt-message "%s(): The current entry should be ccccc.d" test-name)
     (should (string-equal "ccccc.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (1)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (1)" 
test-name)
     (should (string-equal *cdmt-crc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (1)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (1)" 
test-name)
     (should (string-match *cdmt-crc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16805,13 +16806,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ggggg.d" test-name)
+    (cdmt-message "%s(): The current entry should be ggggg.d" test-name)
     (should (string-equal "ggggg.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (2)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (2)" 
test-name)
     (should (string-equal *cdmt-crc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer shouold be untouched (2)" test-name)
+    (cdmt-message "%s(): The dired style buffer shouold be untouched (2)" 
test-name)
     (should (string-match *cdmt-crc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16826,13 +16827,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ooooo.d." test-name)
+    (cdmt-message "%s(): The current entry should be ooooo.d." test-name)
     (should (string-equal "ooooo.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (3)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (3)" 
test-name)
     (should (string-equal *cdmt-crc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (3)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (3)" 
test-name)
     (should (string-match *cdmt-crc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16847,13 +16848,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be zzzzz.d." test-name)
+    (cdmt-message "%s(): The current entry should be zzzzz.d." test-name)
     (should (string-equal "zzzzz.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (4)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (4)" 
test-name)
     (should (string-equal *cdmt-crc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (4)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (4)" 
test-name)
     (should (string-match *cdmt-crc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16868,13 +16869,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should still be zzzzz.d." test-name)
+    (cdmt-message "%s(): The current entry should still be zzzzz.d." test-name)
     (should (string-equal "zzzzz.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (5)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (5)" 
test-name)
     (should (string-equal *cdmt-crc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (5)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (5)" 
test-name)
     (should (string-match *cdmt-crc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-next-line () ;✓
@@ -16888,7 +16889,7 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
        (cpio-catalog-contents-after)
        (entry-name))
 
-    (message test-name)
+    (cdmt-message test-name)
     (cdmt-reset 'make)
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16903,11 +16904,11 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
     (should (string-equal "a" entry-name))
-    (message "%s(): Expecting an untouched dired buffer. (17987)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17987)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (17981)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17981)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17956)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17956)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16923,9 +16924,9 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
     (should (string-equal "aaa" entry-name))
-    (message "%s(): Expecting an untouched dired buffer. (17988)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17988)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (17982)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17982)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16941,11 +16942,11 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
     (should (string-equal "b" entry-name))
-    (message "%s(): Expecting an untouched dired buffer. (17989)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17989)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (17983)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17983)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17957)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17957)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16961,11 +16962,11 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
     (should (equal nil entry-name))
-    (message "%s(): Expecting an untouched dired buffer. (17990)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17990)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (17984)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17984)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17958)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17958)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-next-marked-entry ()
@@ -17029,9 +17030,9 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 1155))
     (should (string-match *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched dired buffer. (17991)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17991)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17959)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17959)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17048,9 +17049,9 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 1019))
     (should (string-match *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched dired buffer. (17992)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17992)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17960)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17960)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17067,9 +17068,9 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
 
     (should (= where 774))
     (should (string-match *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched dired buffer. (17993)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17993)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17961)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17961)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-previous-line ()
@@ -17157,9 +17158,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with every entry except the 
first marked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with every entry 
except the first marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17182,7 +17183,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17962)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17962)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17197,9 +17198,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecing a dired bugger with all but two entries marked." 
test-name)
+    (cdmt-message "%s(): Expecing a dired bugger with all but two entries 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17222,7 +17223,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17963)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17963)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17237,9 +17238,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with another 4 entries 
unmarked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with another 4 entries 
unmarked." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17262,7 +17263,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17964)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17964)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17277,9 +17278,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with yet the last entry 
unmarked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with yet the last 
entry unmarked." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17302,7 +17303,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17965)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17965)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-all-entries ()
@@ -17335,9 +17336,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17360,7 +17361,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17966)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17966)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17374,9 +17375,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17399,7 +17400,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17967)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17967)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17420,9 +17421,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17445,7 +17446,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17968)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17968)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17459,9 +17460,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no B marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no B marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17484,7 +17485,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17969)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17969)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17498,9 +17499,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with neither B nor F 
marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with neither B nor F 
marks." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17523,7 +17524,7 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17970)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17970)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-all-marks ()
@@ -17535,7 +17536,7 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
         (cpio-dired-buffer-contents)
        (cpio-catalog-contents-before)
        (cpio-catalog-contents-after))
-    (message test-name)
+    (cdmt-message test-name)
     (cdmt-reset 'make)
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17556,9 +17557,9 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17581,7 +17582,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17971)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17971)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17595,9 +17596,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17620,7 +17621,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17972)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17972)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-all-marks () ;✓
@@ -17654,11 +17655,11 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (17985)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (17985)" test-name)
     (should (string-equal *cdmt-crc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched dired buffer. (17994)" test-name)
+    (cdmt-message "%s(): Expecting an untouched dired buffer. (17994)" 
test-name)
     (should (string-match *cdmt-crc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17973)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17973)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-crc-cpio-dired-unmark-backward ()
@@ -17875,7 +17876,7 @@ revert-buffer is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting a cpio archive with newDirectory, a new 
directory." test-name)
+    (cdmt-message "%s(): Expecting a cpio archive with newDirectory, a new 
directory." test-name)
     (should (string-equal "070702      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -18209,7 +18210,7 @@ newDirectory    (( filename ))
 \\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio dired buffer with newDirectory, a new 
directory." test-name)
+    (cdmt-message "%s(): Expecting a cpio dired buffer with newDirectory, a 
new directory." test-name)
     (should (string-match  "CPIO archive: alphabet_small.crc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -18233,7 +18234,7 @@ newDirectory    (( filename ))
   drwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with a new directory called 
»newDirectory«." test-name)
+    (cdmt-message "%s(): Expecting a catalog with a new directory called 
»newDirectory«." test-name)
     (should (string-match "((¨newDirectory¨ \\.
 \\s-+»»1 16877 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
diff --git a/cpio-dired-odc-test.el b/cpio-dired-odc-test.el
index 5cc41c0..204eceb 100644
--- a/cpio-dired-odc-test.el
+++ b/cpio-dired-odc-test.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-dired-test.el --- Tests of cpio-dired-mode.
-;      $Id: cpio-dired-odc-test.el,v 1.10 2018/11/29 17:46:58 doug Exp $       
+;;; cpio-dired-odc-test.el --- Tests of cpio-dired-mode for odc archives. -*- 
coding: utf-8 -*-
+;      $Id: cpio-dired-odc-test.el,v 1.13 2018/12/03 19:57:21 doug Exp $       
 
 ;; COPYRIGHT
 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2018 Mar 23
-;; Version: 0.02
-;; Keywords: cpio-mode, cpio-dired-mode, automated test
+;; Version: 0.13β
+;; Keywords: 
 
 ;;; Commentary:
 
@@ -53,9 +52,10 @@
 ;; 
 (load (concat default-directory "test-generic.el"))
 
-(eval-when-compile
-  (if (file-exists-p (concat default-directory "cpio.elc"))
-      (load (concat default-directory "cpio.elc")))
+(setq load-path (add-to-list 'load-path default-directory))
+
+(if (file-exists-p (concat default-directory "cpio.elc"))
+    (load (concat default-directory "cpio.elc"))
   (load (concat default-directory "cpio.el")))
 
 ;;;;;;;;;;;;;;;;
@@ -538,6 +538,7 @@ TRAILER!!!  (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 "
   "The contents of the untouched small archive.")
+
 (setq *cdmt-odc-untouched-small-archive* "070707       (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -893,6 +894,7 @@ TRAILER!!!  (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 "
   "The contents of an untouched archive's dired-style buffer.")
+
 (setq *cdmt-odc-untouched-small-dired-buffer* "CPIO archive: 
alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -1007,6 +1009,7 @@ TRAILER!!!        (( filename ))
 \\s-+#<marker at 2077 in alphabet_small.odc.cpio> #<marker at 2197 in 
alphabet_small.odc.cpio> cpio-mode-entry-unmodified«))
 "
   "An string representing an untouched catalog.")
+
 (setq *cdmt-odc-untouched-small-catalog* "((\"a\" .
 \\s-+[[43252341448 33188 1000 1000 1
 \\s-+(23281 65535)
@@ -3848,6 +3851,7 @@ TRAILER!!!        (( filename ))
 
 "
   "Contents of the untouched large cpio archive buffer.")
+
 (setq *cdmt-odc-untouched-large-archive-buffer* "070707        (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -6672,6 +6676,7 @@ TRAILER!!!        (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} lllll.d
 .+"                                    ;emacs barfs if it's much longer than 
this.
   "Contents of an untouched cpio-dired directory for the large cpio archive.")
+
 (setq *cdmt-odc-untouched-large-dired-buffer* "CPIO archive: alphabet.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -6821,9 +6826,9 @@ then the entry names will be incorrect."
 ;; 
 ;;     (cpio-dired-kill)
 ;; 
-;;     (message "%s(): Dired style buffer should not be live." test-name)
+;;     (cdmt-message "%s(): Dired style buffer should not be live." test-name)
 ;;     (should (not (buffer-live-p cpio-dired-buffer)))
-;;     (message "%s(): Archive buffer should not be live." test-name)
+;;     (cdmt-message "%s(): Archive buffer should not be live." test-name)
 ;;     (should (not (buffer-live-p cpio-archive-buffer)))))
 
   (ert-deftest cdmt-odc-cpio-dired-do-isearch ()
@@ -6872,9 +6877,9 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;;          (setq cpio-dired-buffer-contents-before (with-current-buffer 
cpio-dired-buffer
 ;;;;;;;;                                                    
(buffer-substring-no-properties (point-min) (point-max)))))
 
-;;;;;;;;     (should (progn (message "%s(): Archive buffer should be modified. 
" test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Archive buffer should be 
modified. " test-name)
 ;;;;;;;;                (buffer-modified-p cpio-archive-buffer)))
-;;;;;;;;     (should (progn (message "%s(): test-name Archive buffer should be 
missing exactly the entry for aa."
+;;;;;;;;     (should (progn (cdmt-message "%s(): test-name Archive buffer 
should be missing exactly the entry for aa."
 ;;;;;;;;                (string-equal "070707  (( magic    ))
 ;;;;;;;; DEADBE        (( ino      ))
 ;;;;;;;; 100644        (( mode     ))
@@ -7188,7 +7193,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;; 000000        (( chksum   ))
 ;;;;;;;; TRAILER!!!    (( filename ))
 ;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
-;;;;;;;;     (should (progn (message "%s(): Checking dired-style buffer before 
saving." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Checking dired-style buffer 
before saving." test-name)
 ;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 ;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -7221,9 +7226,9 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 
 ;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min)(point)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
 
-;;;;;;;;     (should (progn (message "%s(): Archive buffer should no longer be 
modified." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Archive buffer should no 
longer be modified." test-name)
 ;;;;;;;;                (not (buffer-modified-p cpio-archive-buffer))))
-;;;;;;;;     (should (progn (message "%s(): Checking the archive buffer after 
saving." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Checking the archive buffer 
after saving." test-name)
 ;;;;;;;;                (string-equal "070707  (( magic    ))
 ;;;;;;;; DEADBE        (( ino      ))
 ;;;;;;;; 100644        (( mode     ))
@@ -7538,7 +7543,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;; TRAILER!!!    (( filename ))
 ;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 
-;;;;;;;;     (should (progn (message "%s(): Checking the dired-style buffer 
after saving." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Checking the dired-style 
buffer after saving." test-name)
 ;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 ;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -7568,7 +7573,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;;     ;; (setq cpio-archive-buffer-contents (substring 
cpio-archive-buffer-contents 0 (match-end 0)))
 ;;;;;;;;     ;; (should (string-equal cpio-archive-buffer-contents-before 
cpio-archive-buffer-contents))
 
-;;;;;;;;     (should (progn (message "%s(): The dired style buffer should not 
have changed." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): The dired style buffer should 
not have changed." test-name)
 ;;;;;;;;                (string-equal cpio-dired-buffer-contents-before 
cpio-dired-buffer-contents)))
 
 ;;;;;;;;     (cdmt-reset)
@@ -7588,7 +7593,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 
 ;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
 
-;;;;;;;;     (should (progn (message "%s(): Expecting the standard archive 
with aaaa moved to ddddd." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Expecting the standard 
archive with aaaa moved to ddddd." test-name)
 ;;;;;;;;                (string-equal "070707  (( magic    ))
 ;;;;;;;; DEADBE        (( ino      ))
 ;;;;;;;; 100644        (( mode     ))
@@ -7903,7 +7908,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;; TRAILER!!!    (( filename ))
 ;;;;;;;; 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 
-;;;;;;;;     (should (progn (message "%s(): Expecting a dired style buffer 
without aaaa." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Expecting a dired style 
buffer without aaaa." test-name)
 ;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 ;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -7943,7 +7948,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 
 ;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
 
-;;;;;;;;     (should (progn (message "%s(): Expecting a small archive with 
d/b, d/bb, d/bbb, d/bbbb." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Expecting a small archive 
with d/b, d/bb, d/bbb, d/bbbb." test-name)
 ;;;;;;;;                (string-equal "070707  (( magic    ))
 ;;;;;;;; DEADBE        (( ino      ))
 ;;;;;;;; 100644        (( mode     ))
@@ -8260,7 +8265,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 
 ;;;;;;;;     ;; (cdmt-odc-do-cpio-id (count-lines (point-min) (point-max)) 
(file-name-nondirectory *cdmt-odc-small-archive*))
 
-;;;;;;;;     (should (progn (message "%s(): Looking for a small dired-style 
buffer with d/b, d/bb, d/bbb, d/bbbb" test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): Looking for a small 
dired-style buffer with d/b, d/bb, d/bbb, d/bbbb" test-name)
 ;;;;;;;;                (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 ;;;;;;;;   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8735,7 +8740,7 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
     
     (set-buffer (setq cpio-dired-buffer (get-buffer (cpio-dired-buffer-name 
*cdmt-odc-small-archive*))))
     
-    (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
+    (progn (setq cpio-catalog-contents-before (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))
           (setq entry-name "aaa")
           (goto-char (point-min))
           (cpio-dired-goto-entry entry-name)
@@ -8756,27 +8761,27 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
             (setq cpio-dired-buffer-contents
                   (with-current-buffer cpio-dired-buffer
                     (buffer-substring-no-properties (point-min) (point-max))))
-            (setq cpio-catalog-contents-after (format "%s" (pp 
(cpio-catalog))))))
+            (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))))
     
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Viewing an entry should not change the archive buffer." 
test-name)
+      (cdmt-message "%s(): Viewing an entry should not change the archive 
buffer." test-name)
       (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Viewing an entry should not change the dired-style 
buffer." test-name)
+      (cdmt-message "%s(): Viewing an entry should not change the dired-style 
buffer." test-name)
       (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-      (message "%s(): The contents buffer should not be null." test-name)
+      (cdmt-message "%s(): The contents buffer should not be null." test-name)
       (should (not (null cpio-contents-buffer)))
-      (message "%s(): The contents buffer should be live." test-name)
+      (cdmt-message "%s(): The contents buffer should be live." test-name)
       (should (buffer-live-p cpio-contents-buffer))
-      (message "%s(): Check the entry's contents buffer." test-name)
+      (cdmt-message "%s(): Check the entry's contents buffer." test-name)
       (should (string-equal cpio-contents-buffer-string "\naaa\n\n"))
-      (message "%s(): The entry's contents' window should be live." test-name)
+      (cdmt-message "%s(): The entry's contents' window should be live." 
test-name)
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting no change to the catalog." test-name)
+      (cdmt-message "%s(): Expecting no change to the catalog." test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
     
     (cdmt-reset)
     
-    (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
+    (progn (setq cpio-catalog-contents-before (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))
           (setq entry-name "ccc")
           (goto-char (point-min))
           (re-search-forward " ccc$" (point-max))
@@ -8795,18 +8800,18 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
             (setq cpio-dired-buffer-contents
                   (with-current-buffer cpio-dired-buffer
                     (buffer-substring-no-properties (point-min) (point-max))))
-            (setq cpio-catalog-contents-after (format "%s" (pp 
(cpio-catalog))))))
+            (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))))
     
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Checking the archive buffer." test-name)
+      (cdmt-message "%s(): Checking the archive buffer." test-name)
       (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Checking the dired-style buffer." test-name)
+      (cdmt-message "%s(): Checking the dired-style buffer." test-name)
       (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting no change to the catalog." test-name)
+      (cdmt-message "%s(): Expecting no change to the catalog." test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-odc-cpio-dired-do-async-shell-command ()
@@ -8826,7 +8831,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
        (cpio-catalog-contents-after))
     (cdmt-reset 'make)
 
-    (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
+    (progn (setq cpio-catalog-contents-before (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))
           (cpio-dired-move-to-first-entry)
           (setq unread-command-events (listify-key-sequence "9999\n"))
           (cpio-dired-do-chgrp 1)
@@ -8837,11 +8842,11 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
           (setq cpio-dired-buffer-contents
                 (with-current-buffer cpio-dired-buffer
                   (buffer-substring-no-properties (point-min) (point-max))))
-          (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
+          (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog) 
'cdmt-noop))))
 
-    (message "%s(): Expecting an unchanged archive. (8814)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive. (8814)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting 'a' to have group 9999." test-name)
+    (cdmt-message "%s(): Expecting 'a' to have group 9999." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  9999        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8864,7 +8869,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting a catalog with the first entry having group 
9999." test-name)
+    (cdmt-message "%s(): Expecting a catalog with the first entry having group 
9999." test-name)
     (should (string-match "((\"a\" \.
 \\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -8959,7 +8964,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
 
     (cdmt-reset)
 
-    (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
+    (progn (setq cpio-catalog-contents-before (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))
           (setq unread-command-events (listify-key-sequence "8888\n"))
           (cpio-dired-do-chgrp 4)
           (setq cpio-archive-buffer-contents
@@ -8969,11 +8974,11 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
           (setq cpio-dired-buffer-contents
                 (with-current-buffer cpio-dired-buffer
                   (buffer-substring-no-properties (point-min) (point-max))))
-          (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
+          (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog) 
'cdmt-noop))))
     
-    (message "%s(): The archive buffer doesn't change until saving." test-name)
+    (cdmt-message "%s(): The archive buffer doesn't change until saving." 
test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting the first 4 entries to have group 8888." 
test-name)
+    (cdmt-message "%s(): Expecting the first 4 entries to have group 8888." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  8888        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8996,7 +9001,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an archive with 4 entries having group 8888." 
test-name)
+    (cdmt-message "%s(): Expecting an archive with 4 entries having group 
8888." test-name)
     (should (string-match"((\"a\" \.
 \\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9091,7 +9096,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
 
     (cdmt-reset)
 
-    (progn (setq cpio-catalog-contents-before (format "%s" (pp 
(cpio-catalog))))
+    (progn (setq cpio-catalog-contents-before (format "%s" (pp (cpio-catalog) 
'cdmt-noop)))
           (cpio-dired-mark-entries-regexp "\\`...\\'")
           (setq unread-command-events (listify-key-sequence "7777\n"))
           (cpio-dired-do-chgrp 1)
@@ -9102,11 +9107,11 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
           (setq cpio-dired-buffer-contents
                 (with-current-buffer cpio-dired-buffer
                   (buffer-substring-no-properties (point-min) (point-max))))
-          (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog)))))
+          (setq cpio-catalog-contents-after (format "%s" (pp (cpio-catalog) 
'cdmt-noop))))
 
-    (message "%s(): The archive is not changed until saved. (8894)" test-name)
+    (cdmt-message "%s(): The archive is not changed until saved. (8894)" 
test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting \`...\' to have group 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have group 7777." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9129,7 +9134,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to have group 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have group 7777." test-name)
     (should (string-match "((\"a\" \.
 \\s-+\[\[[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9248,10 +9253,10 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting the first entry to have mode -rwxr-xr-x." 
test-name)
+    (cdmt-message "%s(): Expecting the first entry to have mode -rwxr-xr-x." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
-  -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
+  -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaa
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aaaa
@@ -9271,7 +9276,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting a mode of 0755 on the first entry." test-name)
+    (cdmt-message "%s(): Expecting a mode of 0755 on the first entry." 
test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -9605,7 +9610,7 @@ TRAILER!!!        (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a mode of 0755 (33261) on the first entry." 
test-name)
+    (cdmt-message "%s(): Expecting a mode of 0755 (33261) on the first entry." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9711,8 +9716,8 @@ TRAILER!!!        (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting aaa, aaaa, aaaaa to have mode -rw------." 
test-name)
-    (message "%s(): Expecting aaaaa.d to have mode dr--------." test-name)
+    (cdmt-message "%s(): Expecting aaa, aaaa, aaaaa to have mode -rw------." 
test-name)
+    (cdmt-message "%s(): Expecting aaaaa.d to have mode dr--------." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9735,12 +9740,12 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-  (message "%s(): Expecting an unchanged archive buffer." test-name)
-  (message "%s(): The archive is not modified until saving." test-name)
+  (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
+  (cdmt-message "%s(): The archive is not modified until saving." test-name)
   (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-  (message "%s(): Expecting aaa, aaaa, aaaaa to have mode 0100600 (33152)." 
test-name)
-  (message "%s(): Expecting aaaaa.d to have mode 040600 (16768)." test-name)
+  (cdmt-message "%s(): Expecting aaa, aaaa, aaaaa to have mode 0100600 
(33152)." test-name)
+  (cdmt-message "%s(): Expecting aaaaa.d to have mode 040600 (16768)." 
test-name)
   (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9846,7 +9851,7 @@ TRAILER!!!        (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting ... to have mode -rw-rw----." test-name)
+    (cdmt-message "%s(): Expecting ... to have mode -rw-rw----." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9869,10 +9874,10 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting ... to have mode 0100660 (33200)." test-name)
+    (cdmt-message "%s(): Expecting ... to have mode 0100660 (33200)." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9976,11 +9981,11 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting all the above mode changes in the archive 
buffer." test-name)
-    (message "%s(): • a has mode 0100755 (100755)." test-name)
-    (message "%s(): • aaa, aaaa, aaaaa have mode 0100600 (100600)." test-name)
-    (message "%s(): • aaaaa.d has mode 040600 (040600)." test-name)
-    (message "%s(): • ... have mode 0660 (100660 for files or 040660 for 
directories)." test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the archive 
buffer." test-name)
+    (cdmt-message "%s(): • a has mode 0100755 (100755)." test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa have mode 0100600 (100600)." 
test-name)
+    (cdmt-message "%s(): • aaaaa.d has mode 040600 (040600)." test-name)
+    (cdmt-message "%s(): • ... have mode 0660 (100660 for files or 040660 for 
directories)." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100755 (( mode     ))
@@ -10314,10 +10319,10 @@ TRAILER!!!    (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting all the above mode changes in the dired buffer." 
test-name)
-    (message "%s(): • a has mode -rwxr-xr-x" test-name)
-    (message "%s(): • aaa, aaaa, aaaaa, aaaaa.d have mode -rw-r--r--" 
test-name)
-    (message "%s(): • ... have mode -rw-rw----" test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the dired 
buffer." test-name)
+    (cdmt-message "%s(): • a has mode -rwxr-xr-x" test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa, aaaaa.d have mode -rw-r--r--" 
test-name)
+    (cdmt-message "%s(): • ... have mode -rw-rw----" test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10340,12 +10345,12 @@ TRAILER!!!    (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting all the above mode changes in the catalog." 
test-name)
-    (message "%s(): • a has mode 33261." test-name)
-    (message "%s(): • aaa, aaaa, aaaaa have mode 33152." test-name)
-    (message "%s(): • aaaaa.d has mode 16768." test-name)
-    (message "%s(): • ... have mode 33200 for files." test-name)
-    (message "%s():                 16816 for directories." test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the catalog." 
test-name)
+    (cdmt-message "%s(): • a has mode 33261." test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa have mode 33152." test-name)
+    (cdmt-message "%s(): • aaaaa.d has mode 16768." test-name)
+    (cdmt-message "%s(): • ... have mode 33200 for files." test-name)
+    (cdmt-message "%s():                 16816 for directories." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10464,10 +10469,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog))
 
-    (message "%s(): The archive buffer is not modified until saved. (10741)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(10741)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with the owner of 'a' being 
9999." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with the owner of 'a' 
being 9999." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  9999  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10490,7 +10495,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): The owner of 'a' should be 9999." test-name)
+    (cdmt-message "%s(): The owner of 'a' should be 9999." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10597,10 +10602,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (11111)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(11111)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888." test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10623,7 +10628,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with 4 entries owned by 8888." 
test-name)
+    (cdmt-message "%s(): Expecting a catalog with 4 entries owned by 8888." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10731,10 +10736,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (10818)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(10818)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to be owned by 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to be owned by 7777." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10757,7 +10762,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting ... to be owned by 7777." test-name)
+    (cdmt-message "%s(): Expecting ... to be owned by 7777." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10876,10 +10881,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (18063)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18063)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting entry 'a' to have owner 9999 and group 1111. 
(1605678037047079477)" test-name)
+    (cdmt-message "%s(): Expecting entry 'a' to have owner 9999 and group 
1111. (1605678037047079477)" test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  9999  1111        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10902,7 +10907,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting entry 'a' to have owner 9999 and group 1111. 
(1034533504227655228)" test-name)
+    (cdmt-message "%s(): Expecting entry 'a' to have owner 9999 and group 
1111. (1034533504227655228)" test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 9999 1111 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11010,10 +11015,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive. (9918)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (9918)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11036,7 +11041,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11144,10 +11149,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive. (9958)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (9958)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive*  
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to have owner 7777 and group 3333." 
test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have owner 7777 and group 3333." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11170,7 +11175,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting ... to have owner 7777 and group 3333." 
test-name)
+    (cdmt-message "%s(): Expecting ... to have owner 7777 and group 3333." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11295,7 +11300,7 @@ cpio-dired-do-compress is not yet implemented -- expect 
an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Checking that entry »a« has been copied to »d«." test-name)
+    (cdmt-message "%s(): Checking that entry »a« has been copied to »d«." 
test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -11632,7 +11637,7 @@ a
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Checking that there is an entry »d« in the dired style 
buffer." test-name)
+    (cdmt-message "%s(): Checking that there is an entry »d« in the dired 
style buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11656,7 +11661,7 @@ a
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to see an entry »d«." test-name)
+    (cdmt-message "%s(): Expecting to see an entry »d«." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11782,7 +11787,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Checking for »aaa«, »aaaa«, »aaaaa«, »aaaaa« copied to 
newDirectory in the archive." test-name)
+    (cdmt-message "%s(): Checking for »aaa«, »aaaa«, »aaaaa«, »aaaaa« copied 
to newDirectory in the archive." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -12170,7 +12175,7 @@ aaa
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Checking for the presence of »newDirectory/aaa«, 
»newDirectory/aaaa«, »newDirectory/aaaaa«, »newDirectory/aaaaa«." test-name)
+    (cdmt-message "%s(): Checking for the presence of »newDirectory/aaa«, 
»newDirectory/aaaa«, »newDirectory/aaaaa«, »newDirectory/aaaaa«." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -12335,7 +12340,7 @@ c -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an archive with each 3 letter entry copied to 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting an archive with each 3 letter entry copied 
to newDirectory-1." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -12708,7 +12713,7 @@ aaa
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired bufffer with ... copied to 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired bufffer with ... copied to 
newDirectory-1." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -12734,7 +12739,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to see ... entries in newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting to see ... entries in newDirectory-1." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -12869,7 +12874,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with each entry named with at least 3 
letters copied to newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting an archive with each entry named with at 
least 3 letters copied to newDirectory-3." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -13395,7 +13400,7 @@ aaa
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting all entries named with at least 3 letters 
to have copies in newDirectory-3." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -13430,7 +13435,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting all entries named with at least 3 letters 
to have copies in newDirectory-3." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -13614,7 +13619,7 @@ cpio-dired-do-copy-regexp is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting entry »a« to be deleted." test-name)
+    (cdmt-message "%s(): Expecting entry »a« to be deleted." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -13930,7 +13935,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting entry »a« to be deleted." test-name)
+    (cdmt-message "%s(): Expecting entry »a« to be deleted." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -13952,7 +13957,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entry »a« deleted." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entry »a« deleted." 
test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14298,7 +14303,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with 4 entries deleted." 
test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with 4 entries 
deleted." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -14316,8 +14321,8 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entries" test-name)
-    (message "%s():     »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entries" test-name)
+    (cdmt-message "%s():     »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted." 
test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14590,7 +14595,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with 4 entries deleted." 
test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with 4 entries 
deleted." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -14604,7 +14609,7 @@ TRAILER!!!      (( filename ))
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        8 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
-    (message "%s(): Expecting a catalog with further entries \`...\' deleted." 
test-name)
+    (cdmt-message "%s(): Expecting a catalog with further entries \`...\' 
deleted." test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14724,11 +14729,11 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive." test-name)
-    (message "%s(): The archive gets updated on save." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): The archive gets updated on save." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired buffer with no entry »a«, but an entry 
»d«." test-name)
+    (cdmt-message "%s(): Expecting a dired buffer with no entry »a«, but an 
entry »d«." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14751,7 +14756,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting catalog with first entry »d«." test-name)
+    (cdmt-message "%s(): Expecting catalog with first entry »d«." test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14857,10 +14862,10 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an as yet unchanged archive." test-name)
+    (cdmt-message "%s(): Expecting an as yet unchanged archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired style buffer with entries »aaaa«, 
»aaaaa«, »aaaaa.d« and »b« moved to »newDirectory«." test-name)
+    (cdmt-message "%s(): Expecting a dired style buffer with entries »aaaa«, 
»aaaaa«, »aaaaa.d« and »b« moved to »newDirectory«." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14883,7 +14888,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with the above changes." test-name)
+    (cdmt-message "%s(): Expecting a catalog with the above changes." 
test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14989,10 +14994,10 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an as yet unchanged archive." test-name)
+    (cdmt-message "%s(): Expecting an as yet unchanged archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired buffer with \`...\' all under 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a dired buffer with \`...\' all under 
newDirectory-1." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -15015,7 +15020,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with \`...\' entries in 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a catalog with \`...\' entries in 
newDirectory-1." test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -15200,14 +15205,14 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
 
 
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Expect an untouched archive. (18064)" test-name)
+      (cdmt-message "%s(): Expect an untouched archive. (18064)" test-name)
       (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
       (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n")))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting an unchanged catalog. (18038)" test-name)
+      (cdmt-message "%s(): Expecting an unchanged catalog. (18038)" test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     (push entry-name past-entries)
@@ -15233,14 +15238,14 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                     (buffer-substring-no-properties (point-min) 
(point-max))))))
 
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Expect an untouched archive. (18065)" test-name)
+      (cdmt-message "%s(): Expect an untouched archive. (18065)" test-name)
       (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
       (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting an unchanged catalog. (18039)" test-name)
+      (cdmt-message "%s(): Expecting an unchanged catalog. (18039)" test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
 
     ;; Now make sure that any past entries are still there.
@@ -15295,9 +15300,9 @@ cpio-dired-find-entry-other-window is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with autosave entries" test-name)
-    (message "%s(): for each single character entry." test-name)
-    (message "%s(): (The copy used to create them must update the archive.)" 
test-name)
+    (cdmt-message "%s(): Expecting an archive with autosave entries" test-name)
+    (cdmt-message "%s(): for each single character entry." test-name)
+    (cdmt-message "%s(): (The copy used to create them must update the 
archive.)" test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -15670,7 +15675,7 @@ c
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired-buffer with autosave files for 
single character entries." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired-buffer with autosave files for 
single character entries." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15696,7 +15701,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #c
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to seee catalog entries for auto-save files for 
single character entries." test-name)
+    (cdmt-message "%s(): Expecting to seee catalog entries for auto-save files 
for single character entries." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -15839,10 +15844,10 @@ cpio-dired-flag-entries-regexp is not yet implemented 
-- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (18066)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18066)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with one entry flagged for 
deletion." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with one entry flagged 
for deletion." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15865,7 +15870,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18040)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18040)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -15880,9 +15885,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (18067)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18067)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with 4 more entries flagged 
for deletion." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with 4 more entries 
flagged for deletion." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15905,7 +15910,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18041)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18041)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-flag-garbage-entries ()
@@ -15937,8 +15942,8 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with entries for suffixes" test-name)
-    (message "%s():     aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting an archive with entries for suffixes" 
test-name)
+    (cdmt-message "%s():     aux bak dvi log orig reg toc." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -16383,9 +16388,9 @@ aa
 \\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired-style buffer with marked entries" 
test-name)
-    (message "%s():     for the suffixes" test-name)
-    (message "%s():     aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with marked entries" 
test-name)
+    (cdmt-message "%s():     for the suffixes" test-name)
+    (cdmt-message "%s():     aux bak dvi log orig reg toc." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16415,8 +16420,8 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa.toc
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entries with the suffixes" 
test-name)
-    (message "%s():     aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entries with the suffixes" 
test-name)
+    (cdmt-message "%s():     aux bak dvi log orig reg toc." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -16592,10 +16597,10 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (18068)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18068)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with the first entry 
marked." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with the first entry 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16618,7 +16623,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18042)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18042)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16634,7 +16639,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
     (should (string-equal cpio-archive-buffer-contents 
*cdmt-odc-untouched-small-archive*))
-    (message "%s(): Expecing a cpio-dired buffer with 4 more entries marked." 
test-name)
+    (cdmt-message "%s(): Expecing a cpio-dired buffer with 4 more entries 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16657,7 +16662,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18043)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18043)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-mark-directories ()
@@ -16673,6 +16678,8 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                :type 'error))
 
 (ert-deftest cdmt-odc-cpio-dired-mark-entries-regexp () ;✓
+  "Test cpio-dired-mark-entries-regexp."
+  :tags '(:expensive-test)
   (let ((test-name "cdmt-odc-cpio-dired-mark-entries-regexp")
         (cpio-archive-buffer)
         (cpio-archive-buffer-contents)
@@ -16693,9 +16700,9 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (18069)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18069)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with ... marked." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with ... marked." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16718,7 +16725,7 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18044)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18044)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-mark-executables ()
@@ -16770,13 +16777,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be aaaaa.d" test-name)
+    (cdmt-message "%s(): The current entry should be aaaaa.d" test-name)
     (should (string-equal "aaaaa.d" entry-name))
-    (message "%s(): Expecting an untouched large archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an untouched large archive buffer." 
test-name)
     (should (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched." test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched." 
test-name)
     (should (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16791,13 +16798,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ccccc.d" test-name)
+    (cdmt-message "%s(): The current entry should be ccccc.d" test-name)
     (should (string-equal "ccccc.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (1)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (1)" 
test-name)
     (should (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (1)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (1)" 
test-name)
     (should (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16812,13 +16819,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ggggg.d" test-name)
+    (cdmt-message "%s(): The current entry should be ggggg.d" test-name)
     (should (string-equal "ggggg.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (2)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (2)" 
test-name)
     (should (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer shouold be untouched (2)" test-name)
+    (cdmt-message "%s(): The dired style buffer shouold be untouched (2)" 
test-name)
     (should (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16833,13 +16840,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ooooo.d." test-name)
+    (cdmt-message "%s(): The current entry should be ooooo.d." test-name)
     (should (string-equal "ooooo.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (3)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (3)" 
test-name)
     (should (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (3)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (3)" 
test-name)
     (should (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16854,13 +16861,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be zzzzz.d." test-name)
+    (cdmt-message "%s(): The current entry should be zzzzz.d." test-name)
     (should (string-equal "zzzzz.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (4)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (4)" 
test-name)
     (should (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (4)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (4)" 
test-name)
     (should (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16875,13 +16882,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should still be zzzzz.d." test-name)
+    (cdmt-message "%s(): The current entry should still be zzzzz.d." test-name)
     (should (string-equal "zzzzz.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (5)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (5)" 
test-name)
     (should (string-equal *cdmt-odc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (5)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (5)" 
test-name)
     (should (string-match *cdmt-odc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-next-line () ;✓
@@ -16910,9 +16917,9 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (string-equal "a" entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (18070)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18070)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18045)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18045)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16929,7 +16936,7 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (string-equal "aaa" entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (18071)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18071)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16946,9 +16953,9 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (string-equal "b" entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (18072)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18072)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18046)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18046)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16965,9 +16972,9 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
 
     (should (equal nil entry-name))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expect an untouched archive. (18073)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18073)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18047)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18047)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-next-marked-entry ()
@@ -17032,7 +17039,7 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
     (should (= where 1155))
     (should (string-match *cdmt-odc-small-archive* 
cpio-archive-buffer-contents))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18048)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18048)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17050,7 +17057,7 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
     (should (= where 1019))
     (should (string-match *cdmt-odc-small-archive* 
cpio-archive-buffer-contents))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18049)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18049)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17066,11 +17073,11 @@ cpio-dired-prev-marked-entry is not yet implemented 
-- expect an error."
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
     (should (= where 774))
-    (message "%s(): Expecting and unchanged small archive. (16677)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16677)" 
test-name)
     (should (string-match *cdmt-odc-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16686)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16686)" 
test-name)
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18050)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18050)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-previous-line ()
@@ -17157,9 +17164,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with every entry except the 
first marked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with every entry 
except the first marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17182,7 +17189,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18051)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18051)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17197,9 +17204,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecing a dired bugger with all but two entries marked." 
test-name)
+    (cdmt-message "%s(): Expecing a dired bugger with all but two entries 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17222,7 +17229,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18052)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18052)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17237,9 +17244,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with another 4 entries 
unmarked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with another 4 entries 
unmarked." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17262,7 +17269,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18053)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18053)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17277,9 +17284,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with yet the last entry 
unmarked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with yet the last 
entry unmarked." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17302,7 +17309,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18054)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18054)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-all-entries ()
@@ -17335,9 +17342,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17360,7 +17367,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18055)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18055)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17374,9 +17381,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17399,7 +17406,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18056)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18056)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17420,9 +17427,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17445,7 +17452,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18057)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18057)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17459,9 +17466,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no B marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no B marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17484,7 +17491,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18058)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18058)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17498,9 +17505,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with neither B nor F 
marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with neither B nor F 
marks." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17523,7 +17530,7 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18059)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18059)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-all-marks ()
@@ -17555,9 +17562,9 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17580,7 +17587,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18060)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18060)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
 
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17594,9 +17601,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17619,7 +17626,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (18061)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18061)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-all-marks () ;✓
@@ -17653,10 +17660,10 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expect an untouched archive. (18074)" test-name)
+    (cdmt-message "%s(): Expect an untouched archive. (18074)" test-name)
     (should (string-equal *cdmt-odc-untouched-small-archive* 
cpio-archive-buffer-contents))
     (should (string-match *cdmt-odc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (18062)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (18062)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-odc-cpio-dired-unmark-backward ()
@@ -17873,7 +17880,7 @@ revert-buffer is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting a cpio archive with newDirectory, a new 
directory." test-name)
+    (cdmt-message "%s(): Expecting a cpio archive with newDirectory, a new 
directory." test-name)
     (should (string-equal "070707      (( magic    ))
 DEADBE (( ino      ))
 100644 (( mode     ))
@@ -18207,7 +18214,7 @@ newDirectory    (( filename ))
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio dired buffer with newDirectory, a new 
directory." test-name)
+    (cdmt-message "%s(): Expecting a cpio dired buffer with newDirectory, a 
new directory." test-name)
     (should (string-match  "CPIO archive: alphabet_small.odc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -18231,7 +18238,7 @@ newDirectory    (( filename ))
   drwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with a new directory called 
»newDirectory«." test-name)
+    (cdmt-message "%s(): Expecting a catalog with a new directory called 
»newDirectory«." test-name)
     (should (string-match "((¨newDirectory¨ \\.
 \\s-+»»[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -18338,8 +18345,8 @@ newDirectory    (( filename ))
 
 (unless noninteractive 
   (setq debug-on-error t)
-  (ert "^cdmt-odc-"))
+  (ert "^cdmt-odc-")
+  (cdmt-reset))
 
-(cdmt-reset)
 
 ;;; cpio-dired-test.el ends here.
diff --git a/cpio-dired-test.el b/cpio-dired-test.el
index b7e0d96..36ef600 100644
--- a/cpio-dired-test.el
+++ b/cpio-dired-test.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-dired-test.el --- Tests of cpio-dired-mode.
-;      $Id: cpio-dired-test.el,v 1.12 2018/11/29 17:46:58 doug Exp $   
+;;; cpio-dired-test.el --- Tests of cpio-dired-mode for newc archives. -*- 
coding: utf-8 -*-
+;      $Id: cpio-dired-test.el,v 1.15 2018/12/03 19:57:21 doug Exp $   
 
 ;; COPYRIGHT
 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2018 Mar 23
-;; Version: 0.02
-;; Keywords: cpio-mode, cpio-dired-mode, automated test
+;; Version: 0.13β
+;; Keywords: 
 
 ;;; Commentary:
 
@@ -6801,10 +6800,10 @@ TRAILER!!!      (( filename ))
 ;;     
 ;;     (cpio-dired-kill)
 ;;     
-;;     (should (progn (message "%s(): Dired style buffer should not be live." 
test-name)
+;;     (should (progn (cdmt-message "%s(): Dired style buffer should not be 
live." test-name)
 ;;                (not (buffer-live-p cpio-dired-buffer))))
 ;; 
-;;     (should (progn (message "%s(): Archive buffer should not be live." 
test-name)
+;;     (should (progn (cdmt-message "%s(): Archive buffer should not be live." 
test-name)
 ;;                (not (buffer-live-p cpio-archive-buffer))))))
 
 (ert-deftest cdmt-newc-cpio-dired-do-isearch ()
@@ -6853,7 +6852,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;;          (setq cpio-dired-buffer-contents-before (with-current-buffer 
cpio-dired-buffer
 ;;;;;;;;                                                    
(buffer-substring-no-properties (point-min) (point-max)))))
 
-;;;;;;;;     (should (progn  (message "%s(): Archive buffer should be 
modified." test-name)
+;;;;;;;;     (should (progn  (cdmt-message "%s(): Archive buffer should be 
modified." test-name)
 ;;;;;;;;                    (buffer-modified-p cpio-archive-buffer)))
 ;;;;;;;;     (should (and "Archive buffer should be missing exactly the entry 
for aa."
 ;;;;;;;;                (string-equal "070701  (( magic    ))
@@ -7549,7 +7548,7 @@ cpio-dired-isearch-entry-names-regexp is not yet 
implemented -- expect an error.
 ;;;;;;;;     ;; (setq cpio-archive-buffer-contents (substring 
cpio-archive-buffer-contents 0 (match-end 0)))
 ;;;;;;;;     ;; (should (string-equal cpio-archive-buffer-contents-before 
cpio-archive-buffer-contents))
 
-;;;;;;;;     (should (progn (message "%s(): The dired style buffer should not 
have changed." test-name)
+;;;;;;;;     (should (progn (cdmt-message "%s(): The dired style buffer should 
not have changed." test-name)
 ;;;;;;;;                (string-equal cpio-dired-buffer-contents-before 
cpio-dired-buffer-contents)))
 
 ;;;;;;;;     (cdmt-reset)
@@ -8743,19 +8742,19 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
             (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog))))
     
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Viewing an entry should not change the archive buffer." 
test-name)
+      (cdmt-message "%s(): Viewing an entry should not change the archive 
buffer." test-name)
       (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Viewing an entry should not change the dired-style 
buffer." test-name)
+      (cdmt-message "%s(): Viewing an entry should not change the dired-style 
buffer." test-name)
       (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-      (message "%s(): The contents buffer should not be null." test-name)
+      (cdmt-message "%s(): The contents buffer should not be null." test-name)
       (should (not (null cpio-contents-buffer)))
-      (message "%s(): The contents buffer should be live." test-name)
+      (cdmt-message "%s(): The contents buffer should be live." test-name)
       (should (buffer-live-p cpio-contents-buffer))
-      (message "%s(): Check the entry's contents buffer." test-name)
+      (cdmt-message "%s(): Check the entry's contents buffer." test-name)
       (should (string-equal cpio-contents-buffer-string "\naaa\n\n"))
-      (message "%s(): The entry's contents' window should be live." test-name)
+      (cdmt-message "%s(): The entry's contents' window should be live." 
test-name)
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting no change to the catalog." test-name)
+      (cdmt-message "%s(): Expecting no change to the catalog." test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
     
     (cdmt-reset)
@@ -8782,15 +8781,15 @@ cpio-dired-diff) ; is not yet implemented -- expect an 
error."
             (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog))))
     
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Checking the archive buffer." test-name)
+      (cdmt-message "%s(): Checking the archive buffer." test-name)
       (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Checking the dired-style buffer." test-name)
+      (cdmt-message "%s(): Checking the dired-style buffer." test-name)
       (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting no change to the catalog." test-name)
+      (cdmt-message "%s(): Expecting no change to the catalog." test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))))
 
 (ert-deftest cdmt-newc-cpio-dired-do-async-shell-command ()
@@ -8824,10 +8823,10 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an unchanged archive. (8814)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive. (8814)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 'a' to have group 9999." test-name)
+    (cdmt-message "%s(): Expecting 'a' to have group 9999." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  9999        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8850,7 +8849,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with  the first entry having group 
9999." test-name)
+    (cdmt-message "%s(): Expecting a catalog with  the first entry having 
group 9999." test-name)
     (should (string-match "((¨a¨ .
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ 9999 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -8957,10 +8956,10 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The archive buffer doesn't change until saving." test-name)
+    (cdmt-message "%s(): The archive buffer doesn't change until saving." 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting the first 4 entries to have group 8888." 
test-name)
+    (cdmt-message "%s(): Expecting the first 4 entries to have group 8888." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  8888        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -8983,7 +8982,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with the first 3 entries having group 
8888." test-name)
+    (cdmt-message "%s(): Expecting a catalog with the first 3 entries having 
group 8888." test-name)
     (should (string-match"((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ 8888 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9091,10 +9090,10 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The archive is not changed until saved. (8894)" test-name)
+    (cdmt-message "%s(): The archive is not changed until saved. (8894)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to have group 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have group 7777." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9117,7 +9116,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to have group 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have group 7777." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9236,7 +9235,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting the first entry to have mode -rwxr-xr-x." 
test-name)
+    (cdmt-message "%s(): Expecting the first entry to have mode -rwxr-xr-x." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9259,7 +9258,7 @@ cpio-dired-do-async-shell-command) ; is not yet 
implemented -- expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a mode of 0755 on the first entry." test-name)
+    (cdmt-message "%s(): Expecting a mode of 0755 on the first entry." 
test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -9593,7 +9592,7 @@ TRAILER!!!        (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a mode of 0755 (33261) on the first entry." 
test-name)
+    (cdmt-message "%s(): Expecting a mode of 0755 (33261) on the first entry." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9699,8 +9698,8 @@ TRAILER!!!        (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting aaa, aaaa, aaaaa to have mode -rw------." 
test-name)
-    (message "%s(): Expecting aaaaa.d to have mode dr--------." test-name)
+    (cdmt-message "%s(): Expecting aaa, aaaa, aaaaa to have mode -rw------." 
test-name)
+    (cdmt-message "%s(): Expecting aaaaa.d to have mode dr--------." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9723,12 +9722,12 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
-    (message "%s(): The archive is not modified until saving." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): The archive is not modified until saving." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting aaa, aaaa, aaaaa to have mode 0100600 (33152)." 
test-name)
-    (message "%s(): Expecting aaaaa.d to have mode 040600 (16768)." test-name)
+    (cdmt-message "%s(): Expecting aaa, aaaa, aaaaa to have mode 0100600 
(33152)." test-name)
+    (cdmt-message "%s(): Expecting aaaaa.d to have mode 040600 (16768)." 
test-name)
 
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
@@ -9835,7 +9834,7 @@ TRAILER!!!        (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting ... to have mode -rw-rw----." test-name)
+    (cdmt-message "%s(): Expecting ... to have mode -rw-rw----." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -9858,10 +9857,10 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting ... to have mode 0100660 (33200)." test-name)
+    (cdmt-message "%s(): Expecting ... to have mode 0100660 (33200)." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -9965,11 +9964,11 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting all the above mode changes in the archive 
buffer." test-name)
-    (message "%s(): • a has mode 0100755 (000081ED)." test-name)
-    (message "%s(): • aaa, aaaa, aaaaa have mode 0100600 (00008180)." 
test-name)
-    (message "%s(): • aaaaa.d has mode 040600 (00004180)." test-name)
-    (message "%s(): • ... have mode 0660 (000081B0 for files or 000041B0 for 
directories)." test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the archive 
buffer." test-name)
+    (cdmt-message "%s(): • a has mode 0100755 (000081ED)." test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa have mode 0100600 (00008180)." 
test-name)
+    (cdmt-message "%s(): • aaaaa.d has mode 040600 (00004180)." test-name)
+    (cdmt-message "%s(): • ... have mode 0660 (000081B0 for files or 000041B0 
for directories)." test-name)
     
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
@@ -10304,10 +10303,10 @@ TRAILER!!!    (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting all the above mode changes in the dired buffer." 
test-name)
-    (message "%s(): • a has mode -rwxr-xr-x" test-name)
-    (message "%s(): • aaa, aaaa, aaaaa, aaaaa.d have mode -rw-r--r--" 
test-name)
-    (message "%s(): • ... have mode -rw-rw----" test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the dired 
buffer." test-name)
+    (cdmt-message "%s(): • a has mode -rwxr-xr-x" test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa, aaaaa.d have mode -rw-r--r--" 
test-name)
+    (cdmt-message "%s(): • ... have mode -rw-rw----" test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10330,12 +10329,12 @@ TRAILER!!!    (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting all the above mode changes in the catalog." 
test-name)
-    (message "%s(): • a has mode 33261." test-name)
-    (message "%s(): • aaa, aaaa, aaaaa have mode 33152." test-name)
-    (message "%s(): • aaaaa.d has mode 16768." test-name)
-    (message "%s(): • ... have mode 33200 for files." test-name)
-    (message "                %s(): 16816 for directories." test-name)
+    (cdmt-message "%s(): Expecting all the above mode changes in the catalog." 
test-name)
+    (cdmt-message "%s(): • a has mode 33261." test-name)
+    (cdmt-message "%s(): • aaa, aaaa, aaaaa have mode 33152." test-name)
+    (cdmt-message "%s(): • aaaaa.d has mode 16768." test-name)
+    (cdmt-message "%s(): • ... have mode 33200 for files." test-name)
+    (cdmt-message "                %s(): 16816 for directories." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33261 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10454,10 +10453,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The archive buffer is not modified until saved. (10741)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(10741)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting a cpio-dired buffer with the owner of 'a' being 
9999." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with the owner of 'a' 
being 9999." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  9999  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10480,7 +10479,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): The owner of 'a' should be 9999." test-name)
+    (cdmt-message "%s(): The owner of 'a' should be 9999." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 9999 [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10588,10 +10587,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (11111)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(11111)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting 4 entries with owner 8888." test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10614,7 +10613,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting  a catalog with 4 entries owned by 8888." 
test-name)
+    (cdmt-message "%s(): Expecting  a catalog with 4 entries owned by 8888." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10722,10 +10721,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The archive buffer is not modified until saved. (10818)" 
test-name)
+    (cdmt-message "%s(): The archive buffer is not modified until saved. 
(10818)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting \`...\' to be owned by 7777." test-name)
+    (cdmt-message "%s(): Expecting \`...\' to be owned by 7777." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10748,7 +10747,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting ... to be owned by 7777." test-name)
+    (cdmt-message "%s(): Expecting ... to be owned by 7777." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -10867,10 +10866,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched archive. (11010)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (11010)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting entry 'a' to have owner 9999 and group 1111." 
test-name)
+    (cdmt-message "%s(): Expecting entry 'a' to have owner 9999 and group 
1111." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  9999  1111        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -10893,7 +10892,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting entry 'a' to have owner 9999 and group 1111." 
test-name)
+    (cdmt-message "%s(): Expecting entry 'a' to have owner 9999 and group 
1111." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 9999 1111 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11001,10 +11000,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched archive. (9918)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (9918)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11027,7 +11026,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
+    (cdmt-message "%s(): Expecting 4 entries with owner 8888 and group 2222." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11135,10 +11134,10 @@ TRAILER!!!    (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched archive. (9958)" test-name)
+    (cdmt-message "%s(): Expecting an untouched archive. (9958)" test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive*  
cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting \`...\' to have owner 7777 and group 3333." 
test-name)
+    (cdmt-message "%s(): Expecting \`...\' to have owner 7777 and group 3333." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11161,7 +11160,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting ... to have owner 7777 and group 3333." 
test-name)
+    (cdmt-message "%s(): Expecting ... to have owner 7777 and group 3333." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11286,7 +11285,7 @@ cpio-dired-do-compress is not yet implemented -- expect 
an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Checking that entry »a« has been copied to »d«."  
test-name)
+    (cdmt-message "%s(): Checking that entry »a« has been copied to »d«."  
test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -11623,7 +11622,7 @@ a
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Checking that there is an entry »d« in the dired style 
buffer." test-name)
+    (cdmt-message "%s(): Checking that there is an entry »d« in the dired 
style buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -11647,7 +11646,7 @@ a
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to see an entry »d«." test-name)
+    (cdmt-message "%s(): Expecting to see an entry »d«." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -11772,7 +11771,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Checking for »aaa«, »aaaa«, »aaaaa«, »aaaaa« copied to 
newDirectory in the archive." test-name)
+    (cdmt-message "%s(): Checking for »aaa«, »aaaa«, »aaaaa«, »aaaaa« copied 
to newDirectory in the archive." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -12160,7 +12159,7 @@ aaa
 \\0\\0
 " cpio-archive-buffer-contents))
     
-    (message "%s(): Checking for the presence of »newDirectory/aaa«, 
»newDirectory/aaaa«, »newDirectory/aaaaa«, »newDirectory/aaaaa«." test-name)
+    (cdmt-message "%s(): Checking for the presence of »newDirectory/aaa«, 
»newDirectory/aaaa«, »newDirectory/aaaaa«, »newDirectory/aaaaa«." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -12325,7 +12324,7 @@ c -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with each 3 letter entry copied to 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting an archive with each 3 letter entry copied 
to newDirectory-1." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -12698,7 +12697,7 @@ aaa
 \\0\\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired-style buffer with 3 entries in 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with 3 entries in 
newDirectory-1." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -12724,7 +12723,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-1/aaa
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting to see ... entries in newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting to see ... entries in newDirectory-1." 
test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -12859,7 +12858,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an archive with each entry named with at least 3 
letters copied to newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting an archive with each entry named with at 
least 3 letters copied to newDirectory-3." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -13385,7 +13384,7 @@ aaa
 \\0\\0
 " cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting all entries named with at least 3 letters 
to have copies in newDirectory-3." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -13420,7 +13419,7 @@ C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 C -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        6 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory-3/aaa
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting all entries named with at least 3 letters to 
have copies in newDirectory-3." test-name)
+    (cdmt-message "%s(): Expecting all entries named with at least 3 letters 
to have copies in newDirectory-3." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -13604,7 +13603,7 @@ cpio-dired-do-copy-regexp is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting entry »a« to be deleted." test-name)
+    (cdmt-message "%s(): Expecting entry »a« to be deleted." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -13920,7 +13919,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting entry »a« to be deleted." test-name)
+    (cdmt-message "%s(): Expecting entry »a« to be deleted." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -13942,7 +13941,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entry »a« deleted." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entry »a« deleted." 
test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14042,7 +14041,7 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): $xpecting an archive with one archive deleted but 
otherwise unchanged." test-name)
+    (cdmt-message "%s(): $xpecting an archive with one archive deleted but 
otherwise unchanged." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -14289,7 +14288,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting 4 more consecutive deletions." test-name)
+    (cdmt-message "%s(): Expecting 4 more consecutive deletions." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -14307,8 +14306,8 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entries" test-name)
-    (message "%s(): »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entries" test-name)
+    (cdmt-message "%s(): »aaaa«, »aaaaa«, »aaaaa.d« and »b« deleted." 
test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14389,7 +14388,7 @@ TRAILER!!!      (( filename ))
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an archive with ... deleted." test-name)
+    (cdmt-message "%s(): Expecting an archive with ... deleted." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -14582,7 +14581,7 @@ TRAILER!!!      (( filename ))
 
\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0\\0
 [...]
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with ... all deleted." 
test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with ... all deleted." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa
@@ -14597,7 +14596,7 @@ TRAILER!!!      (( filename ))
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with further entries \`...\' deleted." 
test-name)
+    (cdmt-message "%s(): Expecting a catalog with further entries \`...\' 
deleted." test-name)
     (should (string-match "((¨aa¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14717,11 +14716,11 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an untouched archive." test-name)
-    (message "%s(): The archive gets updated on save." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): The archive gets updated on save." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting a dired buffer with no entry »a«, but an entry 
»d«." test-name)
+    (cdmt-message "%s(): Expecting a dired buffer with no entry »a«, but an 
entry »d«." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14744,7 +14743,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting catalog with first entry »d«." test-name)
+    (cdmt-message "%s(): Expecting catalog with first entry »d«." test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14850,10 +14849,10 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an as yet unchanged archive." test-name)
+    (cdmt-message "%s(): Expecting an as yet unchanged archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting a dired style buffer with entries »aaaa«, 
»aaaaa«, »aaaaa.d« and »b« moved to »newDirectory«." test-name)
+    (cdmt-message "%s(): Expecting a dired style buffer with entries »aaaa«, 
»aaaaa«, »aaaaa.d« and »b« moved to »newDirectory«." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -14876,7 +14875,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting a catalog with the above changes." test-name)
+    (cdmt-message "%s(): Expecting a catalog with the above changes." 
test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -14982,10 +14981,10 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an as yet unchanged archive." test-name)
+    (cdmt-message "%s(): Expecting an as yet unchanged archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
-    (message "%s(): Expecting a dired buffer with \`...\' all under 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a dired buffer with \`...\' all under 
newDirectory-1." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} d
@@ -15008,7 +15007,7 @@ cpio-dired-do-redisplay is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with \`...\' entries in 
newDirectory-1." test-name)
+    (cdmt-message "%s(): Expecting a catalog with \`...\' entries in 
newDirectory-1." test-name)
     (should (string-match "((¨d¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -15163,7 +15162,7 @@ cpio-dired-do-symlink-regexp is not yet implemented -- 
expect an error."
 ;;;;              (buffer-substring-no-properties (point-min) (point-max))))
 ;;;;      (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog 
'keep-mtime)))
 ;;;;     
-;;;;     (should (progn (message "%s(): Expecting a dired buffer with »aaa« 
having a modification time of »%s«." test-name time-str)
+;;;;     (should (progn (cdmt-message "%s(): Expecting a dired buffer with 
»aaa« having a modification time of »%s«." test-name time-str)
 ;;;;              (string-match "CPIO archive: alphabet_small.newc.cpio:
 ;;;; 
 ;;;;   -rw-r--r--   1  1000  1000        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15186,10 +15185,10 @@ cpio-dired-do-symlink-regexp is not yet implemented 
-- expect an error."
 ;;;;   drwxr-xr-x   2  1000  1000        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d\n"
 ;;;;                     cpio-dired-buffer-contents)))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting an archive with »aaa« 
having a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting an archive with 
»aaa« having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-archive-buffer-contents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s: Expecting a catalog with »aaa« having 
a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s: Expecting a catalog with »aaa« 
having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-catalog-contents-after))
 ;;;; 
 ;;;;     (cpio-reset 'make)
@@ -15211,14 +15210,14 @@ cpio-dired-do-symlink-regexp is not yet implemented 
-- expect an error."
 ;;;;              (buffer-substring-no-properties (point-min) (point-max))))
 ;;;;      (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting a dired buffer with files 
starting sith »b«" test-name
-;;;;     ;; (message "%s "having modification times of »2018 Nov 2 1:02:03«." 
test-name
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting a dired buffer with 
files starting sith »b«" test-name
+;;;;     ;; (cdmt-message "%s "having modification times of »2018 Nov 2 
1:02:03«." test-name
 ;;;;     (should (string-equal "uNlIkElY" cpio-dired-buffer-ontents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting an archive with »aaa« 
having a modification time of »2018 Nov 2 1:02:03«" test-name)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting an archive with 
»aaa« having a modification time of »2018 Nov 2 1:02:03«" test-name)
 ;;;;     (should (string-equal "uNlIkElY" cpio-archive-buffer-contents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s: Expecting a catalog with »aaa« having 
a modification time of »2018 Nov 2 1:02:03«" test-name)
+;;;;     ;; (should (progn (cdmt-message "%s: Expecting a catalog with »aaa« 
having a modification time of »2018 Nov 2 1:02:03«" test-name)
 ;;;;     (should (string-equal "uNlIkElY" cpio-catalog-contents-after))
 ;;;; 
 ;;;;     (cpio-reset 'make)
@@ -15240,14 +15239,14 @@ cpio-dired-do-symlink-regexp is not yet implemented 
-- expect an error."
 ;;;;              (buffer-substring-no-properties (point-min) (point-max))))
 ;;;;      (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting a dired buffer with files 
starting sith »c«" test-name
-;;;;     ;; (message "%s "having modification times of »%s«." test-name 
time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting a dired buffer with 
files starting sith »c«" test-name
+;;;;     ;; (cdmt-message "%s "having modification times of »%s«." test-name 
time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-dired-buffer-ontents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting an archive with »aaa« 
having a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting an archive with 
»aaa« having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-archive-buffer-contents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s: Expecting a catalog with »aaa« having 
a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s: Expecting a catalog with »aaa« 
having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-catalog-contents-after))
 ;;;; 
 ;;;;     (cpio-reset 'make)
@@ -15269,14 +15268,14 @@ cpio-dired-do-symlink-regexp is not yet implemented 
-- expect an error."
 ;;;;              (buffer-substring-no-properties (point-min) (point-max))))
 ;;;;      (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting a dired buffer with 
3-char filenames" test-name
-;;;;     ;; (message "%s "having modification times of »%s«." test-name 
time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting a dired buffer with 
3-char filenames" test-name
+;;;;     ;; (cdmt-message "%s "having modification times of »%s«." test-name 
time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-dired-buffer-ontents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting an archive with 3-char 
filenames having a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting an archive with 
3-char filenames having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-archive-buffer-contents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s: Expecting a catalog with 3-char 
filenames having a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s: Expecting a catalog with 3-char 
filenames having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-catalog-contents-after))
 ;;;; 
 ;;;;     (cpio-reset 'make)
@@ -15298,14 +15297,14 @@ cpio-dired-do-symlink-regexp is not yet implemented 
-- expect an error."
 ;;;;              (buffer-substring-no-properties (point-min) (point-max))))
 ;;;;      (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting a dired buffer with 
3-char filenames" test-name
-;;;;     ;; (message "%s "having modification times of »%s«." test-name 
time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting a dired buffer with 
3-char filenames" test-name
+;;;;     ;; (cdmt-message "%s "having modification times of »%s«." test-name 
time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-dired-buffer-ontents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s(): Expecting an archive with 3-char 
filenames having a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s(): Expecting an archive with 
3-char filenames having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-archive-buffer-contents))
 ;;;; 
-;;;;     ;; (should (progn (message "%s: Expecting a catalog with 3-char 
filenames having a modification time of »%s«" test-name time-str)
+;;;;     ;; (should (progn (cdmt-message "%s: Expecting a catalog with 3-char 
filenames having a modification time of »%s«" test-name time-str)
 ;;;;     (should (string-equal "uNlIkElY" cpio-catalog-contents-after))
 ;;;; 
 ;;;;    (cdmt-test-save *cdmt-archive-format*)))
@@ -15376,19 +15375,19 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
                   (cdmt-tidy-up-catalog))))
 
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Expecting an untouched small archive. (14832)" test-name)
+      (cdmt-message "%s(): Expecting an untouched small archive. (14832)" 
test-name)
       (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Expecting an untouched small dired buffer (14834)" 
test-name)
+      (cdmt-message "%s(): Expecting an untouched small dired buffer (14834)" 
test-name)
       (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-      (message "%s(): Expecting a real entry contents buffer. (14836)" 
test-name)
+      (cdmt-message "%s(): Expecting a real entry contents buffer. (14836)" 
test-name)
       (should (not (null cpio-contents-buffer)))
-      (message "%s(): ...and expecting the entry contents buffer to be live. 
(14838)" test-name)
+      (cdmt-message "%s(): ...and expecting the entry contents buffer to be 
live. (14838)" test-name)
       (should (buffer-live-p cpio-contents-buffer))
-      (message "%s(): Expecting that buffer to contain the contents of [[%s]]. 
(14840)" test-name entry-name)
+      (cdmt-message "%s(): Expecting that buffer to contain the contents of 
[[%s]]. (14840)" test-name entry-name)
       (should (string-equal cpio-contents-buffer-string (concat "\n" 
entry-name "\n\n")))
-      (message "%s(): Expecting a live entry contents window. (14842)" 
test-name)
+      (cdmt-message "%s(): Expecting a live entry contents window. (14842)" 
test-name)
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting an unchanged entry contents buffer. (14844)" 
test-name)
+      (cdmt-message "%s(): Expecting an unchanged entry contents buffer. 
(14844)" test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
     
     (push entry-name past-entries)
@@ -15418,15 +15417,15 @@ They reflect an outstanding bug in cpio-affiliated 
buffers."
              (buffer-substring-no-properties (point-min) (point-max)))))
     
     (with-current-buffer cpio-dired-buffer
-      (message "%s(): Expecting an unchanged small archive. (14870)." 
test-name)
+      (cdmt-message "%s(): Expecting an unchanged small archive. (14870)." 
test-name)
       (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-      (message "%s(): Expecting an untouched cpio-dired buffer (14872)" 
test-name)
+      (cdmt-message "%s(): Expecting an untouched cpio-dired buffer (14872)" 
test-name)
       (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
       (should (not (null cpio-contents-buffer)))
       (should (buffer-live-p cpio-contents-buffer))
       (should (string-equal cpio-contents-buffer-string "\nccc\n\n"))
       (should (window-live-p cpio-contents-window))
-      (message "%s(): Expecting an unchanged catalog. (17957)" test-name)
+      (cdmt-message "%s(): Expecting an unchanged catalog. (17957)" test-name)
       (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
     
     ;; Now make sure that any past entries are still there.
@@ -15482,9 +15481,9 @@ cpio-dired-find-entry-other-window is not yet 
implemented -- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an archive with autosave entries" test-name)
-    (message "%s(): for each single character entry." test-name)
-    (message "%s(): (The copy used to create them must update the archive.)" 
test-name)
+    (cdmt-message "%s(): Expecting an archive with autosave entries" test-name)
+    (cdmt-message "%s(): for each single character entry." test-name)
+    (cdmt-message "%s(): (The copy used to create them must update the 
archive.)" test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -15857,7 +15856,7 @@ c
 
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio-dired buffer with an autosave entry for 
each onecharacter entry." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with an autosave entry 
for each onecharacter entry." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -15883,7 +15882,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} #c
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting a catalog with autosave entries for each 
one-character entry." test-name)
+    (cdmt-message "%s(): Expecting a catalog with autosave entries for each 
one-character entry." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -16026,10 +16025,10 @@ cpio-dired-flag-entries-regexp is not yet implemented 
-- expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting and unchanged small archive. (15472)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (15472)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
 
-    (progn (message "%s(): Expecting a cpio-dired buffer with one entry 
flagged for deletion." test-name)
+    (progn (cdmt-message "%s(): Expecting a cpio-dired buffer with one entry 
flagged for deletion." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16052,7 +16051,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17958)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17958)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after)))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16067,9 +16066,9 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting and unchanged small archive. (15510)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (15510)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with another 4 entries 
flagged for deletion." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with another 4 entries 
flagged for deletion." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16092,7 +16091,7 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an unchanged catalog. (17959)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17959)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-flag-garbage-entries ()
@@ -16124,8 +16123,8 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): Expecting an archive with entries for suffixes" test-name)
-    (message "    %s(): aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting an archive with entries for suffixes" 
test-name)
+    (cdmt-message "    %s(): aux bak dvi log orig reg toc." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -16570,9 +16569,9 @@ aa
 \\0\\0\\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a dired-style buffer with marked entries" 
test-name)
-    (message "    %s(): for the suffixes" test-name)
-    (message "    %s(): aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with marked entries" 
test-name)
+    (cdmt-message "    %s(): for the suffixes" test-name)
+    (cdmt-message "    %s(): aux bak dvi log orig reg toc." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16602,8 +16601,8 @@ D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 D -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} aa.toc
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with entries with the suffixes" 
test-name)
-    (message "    %s(): aux bak dvi log orig reg toc." test-name)
+    (cdmt-message "%s(): Expecting a catalog with entries with the suffixes" 
test-name)
+    (cdmt-message "    %s(): aux bak dvi log orig reg toc." test-name)
     (should (string-match "((¨a¨ \.
 \\s-+»»[[:digit:]]+ 33188 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -16780,9 +16779,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting and unchanged small archive. (16216)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16216)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with the first entry 
marked." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with the first entry 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16805,7 +16804,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17960)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17960)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16820,9 +16819,9 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged small archive. (16254)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged small archive. (16254)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with 4 more entries marked." 
test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with 4 more entries 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16845,7 +16844,7 @@ cpio-dired-hide-subdir) ; is not yet implemented -- 
expect an error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17961)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17961)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-mark-directories ()
@@ -16861,6 +16860,8 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                :type 'error))
 
 (ert-deftest cdmt-newc-cpio-dired-mark-entries-regexp () ;✓
+  "Test cpio-dired-mark-entries-regexp."
+  :tags '(:expensive-test)
   (let ((test-name "cdmt-newc-cpio-dired-mark-entries-regexp")
         (cpio-archive-buffer)
         (cpio-archive-buffer-contents)
@@ -16882,9 +16883,9 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting and unchanged small archive. (16313)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16313)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a cpio-dired buffer with ... marked." test-name)
+    (cdmt-message "%s(): Expecting a cpio-dired buffer with ... marked." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -16907,7 +16908,7 @@ cpio-dired-mark-entries-containing-regexp is not yet 
implemented -- expect an er
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17962)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17962)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-mark-executables ()
@@ -16959,13 +16960,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The current entry should be aaaaa.d" test-name)
+    (cdmt-message "%s(): The current entry should be aaaaa.d" test-name)
     (should (string-equal "aaaaa.d" entry-name))
-    (message "%s(): Expecting an untouched large archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an untouched large archive buffer." 
test-name)
     (should (string-equal *cdmt-newc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched." test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched." 
test-name)
     (should (string-match *cdmt-newc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -16980,13 +16981,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The current entry should be ccccc.d" test-name)
+    (cdmt-message "%s(): The current entry should be ccccc.d" test-name)
     (should (string-equal "ccccc.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (1)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (1)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (1)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (1)" 
test-name)
     (should (string-match *cdmt-newc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17001,13 +17002,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
 
-    (message "%s(): The current entry should be ggggg.d" test-name)
+    (cdmt-message "%s(): The current entry should be ggggg.d" test-name)
     (should (string-equal "ggggg.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (2)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (2)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer shouold be untouched (2)" test-name)
+    (cdmt-message "%s(): The dired style buffer shouold be untouched (2)" 
test-name)
     (should (string-match *cdmt-newc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17022,13 +17023,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The current entry should be ooooo.d." test-name)
+    (cdmt-message "%s(): The current entry should be ooooo.d." test-name)
     (should (string-equal "ooooo.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (3)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (3)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (3)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (3)" 
test-name)
     (should (string-match *cdmt-newc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17043,13 +17044,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The current entry should be zzzzz.d." test-name)
+    (cdmt-message "%s(): The current entry should be zzzzz.d." test-name)
     (should (string-equal "zzzzz.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (4)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (4)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (4)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (4)" 
test-name)
     (should (string-match *cdmt-newc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17064,13 +17065,13 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): The current entry should still be zzzzz.d." test-name)
+    (cdmt-message "%s(): The current entry should still be zzzzz.d." test-name)
     (should (string-equal "zzzzz.d" entry-name))
-    (message "%s(): The archive buffer should be untouched. (5)" test-name)
+    (cdmt-message "%s(): The archive buffer should be untouched. (5)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-large-archive-buffer* 
cpio-archive-buffer-contents))
-    (message "%s(): The dired style buffer should be untouched. (5)" test-name)
+    (cdmt-message "%s(): The dired style buffer should be untouched. (5)" 
test-name)
     (should (string-match *cdmt-newc-untouched-large-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog." test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog." test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-next-line () ;✓
@@ -17098,11 +17099,11 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
     (should (string-equal "a" entry-name))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16526)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16526)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting and unchanged small archive. (16526)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16526)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17963)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17963)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17118,9 +17119,9 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
     (should (string-equal "aaa" entry-name))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16545)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16545)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting and unchanged small archive. (16544)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16544)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17136,11 +17137,11 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
     (should (string-equal "b" entry-name))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16563)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16563)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting and unchanged small archive. (16561)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16561)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17964)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17964)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17156,11 +17157,11 @@ cpio-dired-mouse-find-entry-other-window is not yet 
implemented -- expect an err
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
     (should (equal nil entry-name))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16582)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16582)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting and unchanged small archive. (16579)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16579)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17965)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17965)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-next-marked-entry ()
@@ -17223,11 +17224,11 @@ cpio-dired-prev-marked-entry is not yet implemented 
-- expect an error."
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
     (should (= where 1155))
-    (message "%s(): Expecting and unchanged small archive. (16642)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16642)" 
test-name)
     (should (string-equal *cdmt-small-archive* cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16649)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16649)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17966)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17966)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17244,9 +17245,9 @@ cpio-dired-prev-marked-entry is not yet implemented -- 
expect an error."
     
     (should (= where 1019))
     (should (string-match *cdmt-small-archive* cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16667)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16667)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17967)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17967)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17262,11 +17263,11 @@ cpio-dired-prev-marked-entry is not yet implemented 
-- expect an error."
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
     (should (= where 774))
-    (message "%s(): Expecting and unchanged small archive. (16677)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (16677)" 
test-name)
     (should (string-equal *cdmt-small-archive* cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (16686)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (16686)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17968)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17968)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-previous-line ()
@@ -17354,9 +17355,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with every entry except the 
first marked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with every entry 
except the first marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17379,7 +17380,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17969)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17969)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17394,9 +17395,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecing a dired bugger with all but two entries marked." 
test-name)
+    (cdmt-message "%s(): Expecing a dired bugger with all but two entries 
marked." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17419,7 +17420,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17970)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17970)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17434,9 +17435,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched small archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched small archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with another 4 entries 
unmarked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with another 4 entries 
unmarked." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17459,7 +17460,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an unchanged catalog. (17971)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17971)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17474,9 +17475,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an untouched archive." test-name)
+    (cdmt-message "%s(): Expecting an untouched archive." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with yet the last entry 
unmarked." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with yet the last 
entry unmarked." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17499,7 +17500,7 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17972)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17972)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-unmark-all-entries ()
@@ -17532,9 +17533,9 @@ cpio-dired-undo is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17557,7 +17558,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17973)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17973)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17571,9 +17572,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17596,7 +17597,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17974)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17974)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17617,9 +17618,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17642,7 +17643,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an unchanged catalog. (17975)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17975)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17656,9 +17657,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no B marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no B marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17681,7 +17682,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
     
-    (message "%s(): Expecting an unchanged catalog. (17976)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17976)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17695,9 +17696,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with neither B nor F 
marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with neither B nor F 
marks." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17720,7 +17721,7 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17977)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17977)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-unmark-all-marks ()
@@ -17753,9 +17754,9 @@ E -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        7 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a variety of marks in a dired-style buffer." 
test-name)
+    (cdmt-message "%s(): Expecting a variety of marks in a dired-style 
buffer." test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
 \\* -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17778,7 +17779,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
 \\* drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17978)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17978)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))
     
     (progn (setq cpio-catalog-contents-before (cdmt-tidy-up-catalog))
@@ -17792,9 +17793,9 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting an unchanged archive buffer." test-name)
+    (cdmt-message "%s(): Expecting an unchanged archive buffer." test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting a dired-style buffer with no marks." test-name)
+    (cdmt-message "%s(): Expecting a dired-style buffer with no marks." 
test-name)
     (should (string-match "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -17817,7 +17818,7 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
   drwxr-xr-x   2  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} ccccc.d
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting an unchanged catalog. (17979)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17979)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-unmark-all-marks () ;✓
@@ -17851,11 +17852,11 @@ F -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        5 
\\(?:a\\(?:pr\\|ug\\)\\|de
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting and unchanged small archive. (17253)" test-name)
+    (cdmt-message "%s(): Expecting and unchanged small archive. (17253)" 
test-name)
     (should (string-equal *cdmt-newc-untouched-small-archive* 
cpio-archive-buffer-contents))
-    (message "%s(): Expecting an untouched cpio-dired buffer. (17263)" 
test-name)
+    (cdmt-message "%s(): Expecting an untouched cpio-dired buffer. (17263)" 
test-name)
     (should (string-match *cdmt-newc-untouched-small-dired-buffer* 
cpio-dired-buffer-contents))
-    (message "%s(): Expecting an unchanged catalog. (17980)" test-name)
+    (cdmt-message "%s(): Expecting an unchanged catalog. (17980)" test-name)
     (should (string-equal cpio-catalog-contents-before 
cpio-catalog-contents-after))))
 
 (ert-deftest cdmt-newc-cpio-dired-unmark-backward ()
@@ -18072,7 +18073,7 @@ revert-buffer is not yet implemented -- expect an 
error."
                   (buffer-substring-no-properties (point-min) (point-max))))
           (setq cpio-catalog-contents-after (cdmt-tidy-up-catalog)))
     
-    (message "%s(): Expecting a cpio archive with newDirectory, a new 
directory." test-name)
+    (cdmt-message "%s(): Expecting a cpio archive with newDirectory, a new 
directory." test-name)
     (should (string-equal "070701      (( magic    ))
 DEADBEEF       (( ino      ))
 000081A4       (( mode     ))
@@ -18406,7 +18407,7 @@ newDirectory    (( filename ))
 \\0
 " cpio-archive-buffer-contents))
 
-    (message "%s(): Expecting a cpio dired buffer with newDirectory, a new 
directory." test-name)
+    (cdmt-message "%s(): Expecting a cpio dired buffer with newDirectory, a 
new directory." test-name)
     (should (string-match  "CPIO archive: alphabet_small.newc.cpio:
 
   -rw-r--r--   1  [[:digit:]]+  [[:digit:]]+        4 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} a
@@ -18430,7 +18431,7 @@ newDirectory    (( filename ))
   drwxr-xr-x   1  [[:digit:]]+  [[:digit:]]+        0 
\\(?:a\\(?:pr\\|ug\\)\\|dec\\|feb\\|j\\(?:an\\|u[ln]\\)\\|ma[ry]\\|nov\\|oct\\|sep\\)
 [[:digit:]]\\{2\\} [[:digit:]]\\{2\\}:[[:digit:]]\\{2\\} newDirectory
 " cpio-dired-buffer-contents))
 
-    (message "%s(): Expecting a catalog with a new directory called 
»newDirectory«." test-name)
+    (cdmt-message "%s(): Expecting a catalog with a new directory called 
»newDirectory«." test-name)
     (should (string-match "((¨newDirectory¨ .
 \\s-+»»[[:digit:]]+ 16877 [[:digit:]]+ [[:digit:]]+ 1
 \\s-+([[:digit:]]+ [[:digit:]]+)
@@ -18537,8 +18538,8 @@ newDirectory    (( filename ))
 
 (unless noninteractive
   (setq debug-on-error t)
-  (ert "^cdmt-newc-cpio-"))
+  (ert "^cdmt-newc-cpio-")
+  (cdmt-reset))
 
-(cdmt-reset)
 
 ;;; cpio-dired-test.el ends here.
diff --git a/cpio-dired.el b/cpio-dired.el
index 891416f..d4f48e3 100644
--- a/cpio-dired.el
+++ b/cpio-dired.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-dired.el --- UI definition à la dired.
-;      $Id: cpio-dired.el,v 1.15 2018/11/29 17:46:58 doug Exp $        
+;;; cpio-dired.el --- UI definition à la dired. -*- coding: utf-8 -*-
+;      $Id: cpio-dired.el,v 1.18 2018/12/03 19:57:21 doug Exp $        
 
 ;; COPYRIGHT
 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Dec 01
-;; Version: 
-;; Keywords: cpio, cpio-mode, dired
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
@@ -1231,11 +1230,10 @@ the string of command switches for the third argument 
of `diff'."
         (format "Diff %s with%s: " current
                 (if default (format " (default %s)" default) ""))
         target-dir default t))
-      (if current-prefix-arg
-         (read-string "Options for diff: "
-                      (if (stringp diff-switches)
-                          diff-switches
-                        (mapconcat 'identity diff-switches " ")))))))
+      (if current-prefix-arg (read-string "Options for diff: "
+                                         (if (stringp diff-switches)
+                                             diff-switches
+                                           (mapconcat 'identity diff-switches 
" ")))))))
   (let ((fname "cpio-dired-diff"))
     (error "%s() is not yet implemented" fname)))
 
@@ -1305,6 +1303,8 @@ in the buffer containing the archive."
                             ()))
        (local-group (if group
                         group
+                      ;; HEREHERE This (read-string) doesn't play nicely
+                      ;; with make check.
                       (read-string "Group? "
                                    nil
                                    *cpio-dired-do-chgrp-history*)))
@@ -1406,9 +1406,11 @@ into the minibuffer."
                             ()))
        (local-owner (if owner
                         owner
-                      (read-string "Owner? "
-                                   nil
-                                   *cpio-dired-do-chown-history*)))
+                      ;; HERREHERE The following (read-string) doesn't play 
nicely
+                      ;; with make check*.
+                      (read-string "Owner? "
+                                   nil
+                                   *cpio-dired-do-chown-history*)))
        (local-group)
        (local-cpio-dired-buffer (if cpio-dired-buffer
                                     cpio-dired-buffer))
diff --git a/cpio-entry-contents-mode.el b/cpio-entry-contents-mode.el
index a1cc57f..19a7cda 100644
--- a/cpio-entry-contents-mode.el
+++ b/cpio-entry-contents-mode.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-entry-contents-mode.el --- minor mode for editing a cpio-entry's 
contents.
-;      $Id: cpio-entry-contents-mode.el,v 1.9 2018/11/29 01:57:15 doug Exp $   
+;;; cpio-entry-contents-mode.el --- minor mode for editing a cpio-entry's 
contents. -*- coding: utf-8 -*-
+;      $Id: cpio-entry-contents-mode.el,v 1.11 2018/12/03 19:57:21 doug Exp $  
 ;; COPYRIGHT
 ;; 
 ;; Copyright © 2017, 2018 Douglas Lewan, address@hidden
@@ -19,11 +18,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Dec 06
-;; Version: 0.02
-;; Keywords: cpio, contents, edit
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-entry-header.el b/cpio-entry-header.el
index 5bdd9da..58437a1 100644
--- a/cpio-entry-header.el
+++ b/cpio-entry-header.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-entry-header.el --- handle cpio entry headers
-;      $Id: cpio-entry-header.el,v 1.4 2018/05/12 16:36:01 doug Exp $  
+;;; cpio-entry-header.el --- handle cpio entry headers. -*- coding: utf-8 -*-
+;      $Id: cpio-entry-header.el,v 1.6 2018/12/03 19:57:21 doug Exp $  
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, entry header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-generic-tests.el b/cpio-generic-tests.el
index b8d55f3..9e697f2 100644
--- a/cpio-generic-tests.el
+++ b/cpio-generic-tests.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-generic-tests.el --- tests of cpio-generic.el
-;      $Id: cpio-generic-tests.el,v 1.4 2018/11/29 01:57:15 doug Exp $ 
+;;; cpio-generic-tests.el --- tests of cpio-generic.el. -*- coding: utf-8 -*-
+;      $Id: cpio-generic-tests.el,v 1.6 2018/12/03 19:57:21 doug Exp $ 
 
 ;; COPYRIGHT
 ;; 
@@ -20,10 +19,10 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Dec 27
-;; Version: 0.02
+;; Version: 0.13β
 ;; Keywords: 
 
 ;;; Commentary:
diff --git a/cpio-generic.el b/cpio-generic.el
index f6fb6d0..0f915f5 100644
--- a/cpio-generic.el
+++ b/cpio-generic.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-generic.el --- generically useful functions created in support of 
CPIO mode.
-;      $Id: cpio-generic.el,v 1.10 2018/11/29 01:57:15 doug Exp $      
+;;; cpio-generic.el --- generically useful functions created in support of 
CPIO mode. -*- coding: utf-8 -*-
+;      $Id: cpio-generic.el,v 1.13 2018/12/03 19:57:22 doug Exp $      
 
 ;; COPYRIGHT
 ;; 
@@ -21,17 +20,16 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Apr 23
-;; Version: 0.02
-;; Keywords: generically useful emacs lisp functions.
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
 ;;
 ;; This file contains useful generic functions,
-;; commands for managing debuggers
 ;; and other temporarily useful hacks
 ;; to help with the development of cpio-mode.
 ;;
@@ -54,10 +52,6 @@
 
 (defvar *cg-integer-hex-digits* nil)
 
-(defvar *cg-debugger-re* "^\\s-*(message \"%s(): \\([[:digit:]]+\\)\" fname)$"
-  "RE to match a debugger created by M-x insert-debugger.")
-(setq *cg-debugger-re* "^\\s-*(message \"%s(): \\([[:digit:]]+\\)\" fname)")
-
 (defvar *cg-insert-after* nil
   "Value used to define that a marker has type 'insert after'.")
 (defvar *cg-insert-before* t
@@ -700,61 +694,6 @@ Other languages are not yet implemented."
 ;; Commands
 ;; 
 
-(defun insert-debugger ()
-  "Insert a new debugger statement above the line containing point."
-  (interactive)
-  (let ((fname "insert-debugger"))
-    (beginning-of-line)
-    (open-line 1)
-    (insert (format "(message \"%%s(): %d\" fname)" (count-lines (point-min) 
(point))))
-    (indent-according-to-mode)))
-(local-set-key "\M-\C-i" 'insert-debugger)
-
-(defun update-debuggers ()
-  "Update the line numbers in all the debuggers created by M-x 
insert-debugger."
-  (interactive)
-  (let ((fname "update-debuggers"))
-    (save-excursion
-      (save-restriction
-       (goto-char (point-min))
-       (while (re-search-forward *cg-debugger-re* (point-max) t)
-         (replace-match (format "%d" (count-lines (point-min) (point)))
-                        nil nil nil 1))))
-    (save-buffer)))
-(local-set-key "\M-\C-u" 'update-debuggers)
-
-(defun remove-debugger ()
-  "Remove the next debugger.
-Return T if one was found
-and NIL otherwise.
-This function respects narrowing."
-  (interactive)
-  (let ((fname "remove-debugger"))
-    (cond ((re-search-forward *cg-debugger-re* (point-max) t)
-          (delete-region (match-beginning 0) (match-end 0))
-          t)
-         (t nil))))
-
-(defun remove-some-debuggers (arg)
-  "Remove the next ARG debuggers.
-Return non-NIL if any were found and deleted.
-Return NIL if none were found.
-This function respects narrowing."
-  (interactive "p")
-  (let ((fname "remove-some-debuggers")
-       (ct 0))
-    (while (and (< 0 arg) (remove-debugger))
-      (setq ct (1+ ct))
-      (setq arg (1- arg)))
-    ct))
-
-(defun remove-all-debuggers ()
-  "Remove all debuggers created by (insert-debuggers).
-This function respects narrowing."
-  (interactive)
-  (let ((fname "remove-all-debuggers"))
-    (while (remove-debugger))))
-
 
 (provide 'cpio-generic)
 ;;; cpio-generic.el ends here
diff --git a/cpio-hpbin.el b/cpio-hpbin.el
index 4d6dd36..c5ee767 100644
--- a/cpio-hpbin.el
+++ b/cpio-hpbin.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-hpbin.el --- handle hpbin cpio entry header formats
-;      $Id: cpio-hpbin.el,v 1.4 2018/05/12 16:36:02 doug Exp $ 
+;;; cpio-hpbin.el --- handle hpbin cpio entry header formats. -*- coding: 
utf-8 -*-
+;      $Id: cpio-hpbin.el,v 1.6 2018/12/03 19:57:22 doug Exp $ 
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, HP binary header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-hpodc.el b/cpio-hpodc.el
index 6b3f010..dc7fa6e 100644
--- a/cpio-hpodc.el
+++ b/cpio-hpodc.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-hpodc.el --- handle hpodc cpio entry header formats
-;      $Id: cpio-hpodc.el,v 1.4 2018/05/12 16:36:02 doug Exp $ 
+;;; cpio-hpodc.el --- handle hpodc cpio entry header formats. -*- coding: 
utf-8 -*-
+;      $Id: cpio-hpodc.el,v 1.6 2018/12/03 19:57:22 doug Exp $ 
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, HP portable character header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-modes-test.el b/cpio-modes-test.el
index 8d3f5a5..c1b4380 100644
--- a/cpio-modes-test.el
+++ b/cpio-modes-test.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-modes-test.el --- tests of the code in cpio-modes.el.
-;      $Id: cpio-modes-test.el,v 1.6 2018/11/29 17:46:58 doug Exp $    
+;;; cpio-modes-test.el --- tests of the code in cpio-modes.el. -*- coding: 
utf-8 -*-
+;      $Id: cpio-modes-test.el,v 1.8 2018/12/03 19:57:22 doug Exp $    
 
 ;; COPYRIGHT
 ;; 
@@ -20,10 +19,10 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Nov 28
-;; Version: 
+;; Version: 0.13β
 ;; Keywords: 
 
 ;;; Commentary:
diff --git a/cpio-modes.el b/cpio-modes.el
index 8dde9f9..e99c533 100644
--- a/cpio-modes.el
+++ b/cpio-modes.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-modes.el --- handle modes.
-;      $Id: cpio-modes.el,v 1.9 2018/06/26 15:57:50 doug Exp $ 
+;;; cpio-modes.el --- handle file modes/permissions. -*- coding: utf-8 -*-
+;      $Id: cpio-modes.el,v 1.11 2018/12/03 19:57:22 doug Exp $        
 
 ;; COPYRIGHT
 ;; 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Nov 28
-;; Version: 
-;; Keywords: 
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-newc.el b/cpio-newc.el
index f8a399c..8b70568 100644
--- a/cpio-newc.el
+++ b/cpio-newc.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-newc.el --- handle portable SVR4 cpio entry header formats.
-;      $Id: cpio-newc.el,v 1.17 2018/12/02 00:13:07 doug Exp $ 
+;;; cpio-newc.el --- handle portable newc cpio archives. -*- coding: utf-8 -*-
+;      $Id: cpio-newc.el,v 1.19 2018/12/03 19:57:22 doug Exp $ 
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, portable newc header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-odc.el b/cpio-odc.el
index c448c9d..d53ee36 100644
--- a/cpio-odc.el
+++ b/cpio-odc.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-odc.el --- handle old portable cpio entry header format
-;      $Id: cpio-odc.el,v 1.12 2018/12/02 00:13:07 doug Exp $  
+;;; cpio-odc.el --- handle old portable cpio entry header format. -*- coding: 
utf-8 -*-
+;      $Id: cpio-odc.el,v 1.14 2018/12/03 19:57:22 doug Exp $  
 
 ;; COPYRIGHT
 ;; 
@@ -21,11 +20,11 @@
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ;; 
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, binary header
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio-tar.el b/cpio-tar.el
index f72524c..47563fe 100644
--- a/cpio-tar.el
+++ b/cpio-tar.el
@@ -1,5 +1,5 @@
-;; -*- coding: utf-8 -*-
-;; $Id: cpio-tar.el,v 1.4 2018/05/12 16:36:03 doug Exp $
+;; cpio-tar.el --- Let tar-mode handle tar archives. -*- coding: utf-8 -*-
+;; $Id: cpio-tar.el,v 1.5 2018/12/03 19:57:22 doug Exp $
 
 ;; COPYRIGHT
 ;; 
diff --git a/cpio-tests.el b/cpio-tests.el
index 92f2bf8..fc3906e 100644
--- a/cpio-tests.el
+++ b/cpio-tests.el
@@ -1,10 +1,9 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-tests.el --- tests for cpio-mode as a whole.
-;      $Id: cpio-tests.el,v 1.2 2018/05/12 16:36:03 doug Exp $ 
+;;; cpio-tests.el --- tests for cpio-mode as a whole. -*- coding: utf-8 -*-
+;      $Id: cpio-tests.el,v 1.4 2018/12/03 19:57:22 doug Exp $ 
 
 ;; COPYRIGHT
 ;; 
-;; Copyright © 2017, 2018 Douglas Lewan, address@hidden
+;; Copyright © 2017, 2018 Douglas Lewan, address@hidden
 ;; All rights reserved.
 ;; 
 ;; This program is free software: you can redistribute it and/or modify
@@ -20,20 +19,16 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2017 Nov 28
-;; Version: 
-;; Keywords: 
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
-;; This file contains ERT tests for cpio-mode.
-;; Truly generic code has not yet been tested.
-;; Generic code for affiliated buffers is tested in cab-test.el.
-;; cpio-modes.el contains code for manipulating file mode information;
-;; it is tested in cpio-modes-test.el.
-
+;; All the real automated testing happens in cpio-dired-bin/crc/odc-test.el
+;; and cpio-dired-test.el (for newc archives).
 
 ;;; Documentation:
 
diff --git a/cpio-ustar.el b/cpio-ustar.el
index ac2dd0c..f30c98f 100644
--- a/cpio-ustar.el
+++ b/cpio-ustar.el
@@ -1,9 +1,9 @@
-;; -*- coding: utf-8 -*-
-;; $Id: cpio-ustar.el,v 1.4 2018/05/12 16:36:03 doug Exp $
+;; cpio-ustar.el --- Let tar-mode handle tar archives. -*- coding: utf-8 -*-
+;; $Id: cpio-ustar.el,v 1.6 2018/12/03 19:57:22 doug Exp $
 
 ;; COPYRIGHT
 ;; 
-;; Copyright © 2015, 2018 Douglas Lewan, address@hidden
+;; Copyright © 2015, 2018 Douglas Lewan, address@hidden
 ;; All rights reserved.
 ;; 
 ;; This program is free software: you can redistribute it and/or modify
diff --git a/cpio-wanted.el b/cpio-wanted.el
index 71812c1..a1b2379 100644
--- a/cpio-wanted.el
+++ b/cpio-wanted.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio-wanted.el --- Stuff cpio-mode wants from emacs lisp, but that isn't 
there.
-;      $Id: cpio-wanted.el,v 1.2 2018/05/12 16:36:04 doug Exp $        
+;;; cpio-wanted.el --- Stuff cpio-mode wants from emacs lisp, but that isn't 
there. -*- coding: utf-8 -*-
+;      $Id: cpio-wanted.el,v 1.4 2018/12/03 19:57:22 doug Exp $        
 
 ;; COPYRIGHT
 ;; 
@@ -20,11 +19,11 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
+;; Author: Douglas Lewan <address@hidden>
 ;; Maintainer: -- " --
 ;; Created: 2015 Dec 26
-;; Version: 0.02
-;; Keywords: wanted, not provided
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
diff --git a/cpio.el b/cpio.el
index 61eb89f..d251d2c 100644
--- a/cpio.el
+++ b/cpio.el
@@ -1,6 +1,5 @@
-;; -*- coding: utf-8 -*-
-;;; cpio.el --- cpio-mode for emacs
-;      $Id: cpio.el,v 1.19 2018/12/02 00:13:07 doug Exp $      
+;;; cpio.el --- Handle cpio archives in the style of dired. -*- coding: utf-8 
-*-
+;      $Id: cpio.el,v 1.20 2018/12/03 00:43:40 doug Exp $      
 
 ;; COPYRIGHT 2015, 2017, 2018 Douglas Lewan, address@hidden
 ;; All rights reserved.
@@ -18,15 +17,16 @@
 ;; You should have received a copy of the GNU General Public License
 ;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-;; Author: Douglas Lewan (address@hidden)
-;; Maintainer: -- " --
+;; Author: Douglas Lewan <address@hidden>
+;; Maintainer: Douglas Lewan <address@hidden>
 ;; Created: 2015 Jan 03
-;; Version: 0.02
-;; Keywords: cpio, archive
+;; Version: 0.13β
+;; Keywords: files
 
 ;;; Commentary:
 
-;;; Documentation:
+;; This package implements cpio-mode, a mode for viewing cpio archives
+;; through a dired-like interface.
 
 ;; 
 ;; NAME: cpio-mode
@@ -96,6 +96,9 @@
 ;;     when unpacked by root.
 ;; 
 
+;;; Documentation:
+
+
 ;; 
 ;; cpio.el is the entry point to all of cpio-mode.
 ;; It defines the archive management variables and functions
diff --git a/test-generic.el b/test-generic.el
index e737cc3..cd4c199 100644
--- a/test-generic.el
+++ b/test-generic.el
@@ -1,5 +1,39 @@
-;      $Id: test-generic.el,v 1.3 2018/11/29 01:57:16 doug Exp $       
+;;; test-generic.el --- Generic code to support automated tests. -*- coding: 
utf-8 -*-
+;      $Id: test-generic.el,v 1.5 2018/12/03 19:57:22 doug Exp $       
 
+;; COPYRIGHT
+
+;; Copyright © 2017, 2018 Douglas Lewan, address@hidden
+;; All rights reserved.
+;; 
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; 
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; 
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; Author: Douglas Lewan (address@hidden)
+;; Maintainer: -- " --
+;; Created: 2018 Nov 19
+;; Version: 0.13β
+;; Keywords: files
+
+;;; Commentary:
+
+;;; Documentation:
+
+;;; Code:
+
+;;
+;; Dependencies
+;; 
 
 ;;
 ;; Vars
@@ -223,7 +257,7 @@ CAVEATS: \(1\) If ARCHIVE-CONTENTS contains entries that 
contain entry headers,
   "Remove [ and ] from the pretty printed catalog and replace them with » and 
« respectively.
 Return the new string."
   (let ((fname "cdmt-bin-tidy-up-catalog")
-       (catalog-string (pp (cpio-catalog)))
+       (catalog-string (pp (cpio-catalog) 'cdmt-noop))
        (substitutions (list (cons "\\[" "»")
                             (cons "\\]" "«")
                             (cons "\\\"" "¨"))))
@@ -667,9 +701,9 @@ including any messages after the previous one."
          (insert (apply 'format fmt fills))
          (unless (bolp) (insert "\n"))))))
 
-(defun cdmt-message (fmt &rest fills)
-  "A NOOP to replace the functional (cdmt-message)."
-  (let ((fname "cdmt-message"))))
+;; (defun cdmt-message (fmt &rest fills)
+;;   "A NOOP to replace the functional (cdmt-message)."
+;;   (let ((fname "cdmt-message"))))
 
 (defun cdmt-ensure-test-names ()
   "Make sure every message after the point includes the test-name."
@@ -765,3 +799,81 @@ including any messages after the previous one."
                   fname (count-lines (point-min) (point))))))
       ;; And do it all again.
       )))
+
+(defun cdmt-noop (c)
+  "Accept the character C and do nothing."
+  (let ((fname "cdmt-noop"))))
+
+
+;;
+;; Functions for managing standard debuggers
+;; 
+(defvar *cg-debugger-re* "^\\s-*(message \"%s(): \\([[:digit:]]+\\)\" 
\\(f\\|test-\\)name)$"
+  "RE to match a debugger created by M-x insert-debugger.")
+(setq *cg-debugger-re* "^\\s-*(message \"%s(): \\([[:digit:]]+\\)\" 
\\(f\\|test-\\)name)$")
+
+(defun insert-debugger ()
+  "Insert a new debugger statement above the line containing point."
+  (interactive)
+  (let ((fname "insert-debugger")
+       (var-name))
+
+    (if (string-match "-test.el" (buffer-file-name))
+       (setq var-name "test-name")
+      (setq var-name fname))
+
+    (beginning-of-line)
+    (open-line 1)
+    (insert (format "(message \"%%s(): %d\" %s)" (count-lines (point-min) 
(point)) var-name))
+    (indent-according-to-mode)))
+(local-set-key "\M-\C-i" 'insert-debugger)
+
+(defun update-debuggers ()
+  "Update the line numbers in all the debuggers created by M-x 
insert-debugger."
+  (interactive)
+  (let ((fname "update-debuggers"))
+    (save-excursion
+      (save-restriction
+       (goto-char (point-min))
+       (while (re-search-forward *cg-debugger-re* (point-max) t)
+         (replace-match (format "%d" (count-lines (point-min) (point)))
+                        nil nil nil 1))))
+    (save-buffer)))
+(local-set-key "\M-\C-u" 'update-debuggers)
+
+(defun remove-debugger ()
+  "Remove the next debugger.
+Return T if one was found
+and NIL otherwise.
+This function respects narrowing."
+  (interactive)
+  (let ((fname "remove-debugger"))
+    (cond ((re-search-forward *cg-debugger-re* (point-max) t)
+          (delete-region (match-beginning 0) (match-end 0))
+          t)
+         (t nil))))
+
+(defun remove-some-debuggers (arg)
+  "Remove the next ARG debuggers.
+Return non-NIL if any were found and deleted.
+Return NIL if none were found.
+This function respects narrowing."
+  (interactive "p")
+  (let ((fname "remove-some-debuggers")
+       (ct 0))
+    (while (and (< 0 arg) (remove-debugger))
+      (setq ct (1+ ct))
+      (setq arg (1- arg)))
+    ct))
+
+(defun remove-all-debuggers ()
+  "Remove all debuggers created by (insert-debuggers).
+This function respects narrowing."
+  (interactive)
+  (let ((fname "remove-all-debuggers"))
+    (while (remove-debugger))))
+
+(provide 'test-generic)
+;;; test-generic.el ends here
+
+
diff --git a/ttt.el b/ttt.el
index b10c347..c33d0f4 100644
--- a/ttt.el
+++ b/ttt.el
@@ -1,10 +1,56 @@
-;      $Id: ttt.el,v 1.4 2018/12/02 00:13:07 doug Exp $        
+;;; ttt.el --- Run lots of tests against cpio-mode. -*- coding: utf-8 -*-
+;      $Id: ttt.el,v 1.5 2018/12/03 19:57:22 doug Exp $        
+
+;; COPYRIGHT
+
+;; Copyright © 2017, 2018 Douglas Lewan, address@hidden
+;; All rights reserved.
+;; 
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+;; 
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+;; 
+;; You should have received a copy of the GNU General Public License
+;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+;; Author: Douglas Lewan (address@hidden)
+;; Maintainer: -- " --
+;; Created: 2018 Nov 27
+;; Version: 0.13β
+;; Keywords: files
+
+;;; Commentary:
 
 ;;
 ;; Eval this buffer to run lots of tests against cpio-mode.
 ;;
 
-;; From cards/deck.el
+;;; Documentation:
+
+;;; Code:
+
+;;
+;; Dependencies
+;; 
+
+
+;; 
+;; Vars
+;; 
+(defvar ttt-buffers)
+(setq ttt-buffers (list "cab-test.el" "cpio-dired-bin-test.el" 
"cpio-dired-crc-test.el" "cpio-dired-odc-test.el" "cpio-dired-test.el"))
+
+
+;; 
+;; Library
+;; 
+
 (defun randomize-list (ltr)
   "Randomize a list using Knuth's algorithm."
   (mapcar (lambda (le)
@@ -18,14 +64,19 @@
                        (t
                         nil))))))
 
-(defvar ttt-buffers)
-(setq ttt-buffers (list "cab-test.el" "cpio-dired-bin-test.el" 
"cpio-dired-crc-test.el" "cpio-dired-odc-test.el" "cpio-dired-test.el"))
-(mapc 'find-file-noselect ttt-buffers)
+
+;; 
+;; Commands
+;; 
+
+
+;;
+;; Do something.
+;;
+
 (setq ttt-buffers (randomize-list (append ttt-buffers ttt-buffers ttt-buffers 
ttt-buffers ttt-buffers ttt-buffers ttt-buffers ttt-buffers)))
-(setq ttt-buffers (randomize-list ttt-buffers))
 
-(shell-command "make clean" "*clean*")
-(shell-command "make elc" "*elc*")
+(mapc 'find-file-noselect ttt-buffers)
 
 ;; (mapc 'eval-buffer b)
 (let ((ct 0))
@@ -37,3 +88,7 @@
          (sit-for 2.0))
        ttt-buffers))
 
+
+(provide 'ttt)
+;;; ttt.el ends here
+



reply via email to

[Prev in Thread] Current Thread [Next in Thread]