Rename all test files to reflect source layout.

 * CONTRIBUTE,Makefile.in,configure.ac: Update to reflect
   test directory moves.
 * test/file-organisation.org: New file.
 * test/automated/Makefile.in
   test/automated/data/decompress/foo.gz
   test/automated/data/epg/pubkey.asc
   test/automated/data/epg/seckey.asc
   test/automated/data/files-bug18141.el.gz
   test/automated/data/flymake/test.c
   test/automated/data/flymake/test.pl
   test/automated/data/package/archive-contents
   test/automated/data/package/key.pub
   test/automated/data/package/key.sec
   test/automated/data/package/multi-file-0.2.3.tar
   test/automated/data/package/multi-file-readme.txt
   test/automated/data/package/newer-versions/archive-contents
   test/automated/data/package/newer-versions/new-pkg-1.0.el
   test/automated/data/package/newer-versions/simple-single-1.4.el
   test/automated/data/package/package-test-server.py
   test/automated/data/package/signed/archive-contents
   test/automated/data/package/signed/archive-contents.sig
   test/automated/data/package/signed/signed-bad-1.0.el
   test/automated/data/package/signed/signed-bad-1.0.el.sig
   test/automated/data/package/signed/signed-good-1.0.el
   test/automated/data/package/signed/signed-good-1.0.el.sig
   test/automated/data/package/simple-depend-1.0.el
   test/automated/data/package/simple-single-1.3.el
   test/automated/data/package/simple-single-readme.txt
   test/automated/data/package/simple-two-depend-1.1.el
   test/automated/abbrev-tests.el
   test/automated/auto-revert-tests.el
   test/automated/calc-tests.el
   test/automated/icalendar-tests.el
   test/automated/character-fold-tests.el
   test/automated/comint-testsuite.el
   test/automated/descr-text-test.el
   test/automated/electric-tests.el
   test/automated/cl-generic-tests.el
   test/automated/cl-lib-tests.el
   test/automated/eieio-test-methodinvoke.el
   test/automated/eieio-test-persist.el
   test/automated/eieio-tests.el
   test/automated/ert-tests.el
   test/automated/ert-x-tests.el
   test/automated/generator-tests.el
   test/automated/let-alist.el
   test/automated/map-tests.el
   test/automated/advice-tests.el
   test/automated/package-test.el
   test/automated/pcase-tests.el
   test/automated/regexp-tests.el
   test/automated/seq-tests.el
   test/automated/subr-x-tests.el
   test/automated/tabulated-list-test.el
   test/automated/thunk-tests.el
   test/automated/timer-tests.el
   test/automated/epg-tests.el
   test/automated/eshell.el
   test/automated/faces-tests.el
   test/automated/file-notify-tests.el
   test/automated/auth-source-tests.el
   test/automated/gnus-tests.el
   test/automated/message-mode-tests.el
   test/automated/help-fns.el
   test/automated/imenu-test.el
   test/automated/info-xref.el
   test/automated/mule-util.el
   test/automated/isearch-tests.el
   test/automated/json-tests.el
   test/automated/bytecomp-tests.el
   test/automated/coding-tests.el
   test/automated/core-elisp-tests.el
   test/automated/decoder-tests.el
   test/automated/files.el
   test/automated/font-parse-tests.el
   test/automated/lexbind-tests.el
   test/automated/occur-tests.el
   test/automated/process-tests.el
   test/automated/syntax-tests.el
   test/automated/textprop-tests.el
   test/automated/undo-tests.el
   test/automated/man-tests.el
   test/automated/completion-tests.el
   test/automated/dbus-tests.el
   test/automated/newsticker-tests.el
   test/automated/sasl-scram-rfc-tests.el
   test/automated/tramp-tests.el
   test/automated/obarray-tests.el
   test/automated/compile-tests.el
   test/automated/elisp-mode-tests.el
   test/automated/f90.el
   test/automated/flymake-tests.el
   test/automated/python-tests.el
   test/automated/ruby-mode-tests.el
   test/automated/subword-tests.el
   test/automated/replace-tests.el
   test/automated/simple-test.el
   test/automated/sort-tests.el
   test/automated/subr-tests.el
   test/automated/reftex-tests.el
   test/automated/sgml-mode-tests.el
   test/automated/tildify-tests.el
   test/automated/thingatpt.el
   test/automated/url-future-tests.el
   test/automated/url-util-tests.el
   test/automated/add-log-tests.el
   test/automated/vc-bzr.el
   test/automated/vc-tests.el
   test/automated/xml-parse-tests.el
   test/BidiCharacterTest.txt
   test/biditest.el
   test/cedet/cedet-utests.el
   test/cedet/ede-tests.el
   test/cedet/semantic-ia-utest.el
   test/cedet/semantic-tests.el
   test/cedet/semantic-utest-c.el
   test/cedet/semantic-utest.el
   test/cedet/srecode-tests.el
   test/cedet/tests/test.c
   test/cedet/tests/test.el
   test/cedet/tests/test.make
   test/cedet/tests/testdoublens.cpp
   test/cedet/tests/testdoublens.hpp
   test/cedet/tests/testfriends.cpp
   test/cedet/tests/testjavacomp.java
   test/cedet/tests/testnsp.cpp
   test/cedet/tests/testpolymorph.cpp
   test/cedet/tests/testspp.c
   test/cedet/tests/testsppcomplete.c
   test/cedet/tests/testsppreplace.c
   test/cedet/tests/testsppreplaced.c
   test/cedet/tests/testsubclass.cpp
   test/cedet/tests/testsubclass.hh
   test/cedet/tests/testtypedefs.cpp
   test/cedet/tests/testvarnames.c
   test/etags/CTAGS.good
   test/etags/ETAGS.good_1
   test/etags/ETAGS.good_2
   test/etags/ETAGS.good_3
   test/etags/ETAGS.good_4
   test/etags/ETAGS.good_5
   test/etags/ETAGS.good_6
   test/etags/a-src/empty.zz
   test/etags/a-src/empty.zz.gz
   test/etags/ada-src/2ataspri.adb
   test/etags/ada-src/2ataspri.ads
   test/etags/ada-src/etags-test-for.ada
   test/etags/ada-src/waroquiers.ada
   test/etags/c-src/a/b/b.c
   test/etags/c-src/abbrev.c
   test/etags/c-src/c.c
   test/etags/c-src/dostorture.c
   test/etags/c-src/emacs/src/gmalloc.c
   test/etags/c-src/emacs/src/keyboard.c
   test/etags/c-src/emacs/src/lisp.h
   test/etags/c-src/emacs/src/regex.h
   test/etags/c-src/etags.c
   test/etags/c-src/exit.c
   test/etags/c-src/exit.strange_suffix
   test/etags/c-src/fail.c
   test/etags/c-src/getopt.h
   test/etags/c-src/h.h
   test/etags/c-src/machsyscalls.c
   test/etags/c-src/machsyscalls.h
   test/etags/c-src/sysdep.h
   test/etags/c-src/tab.c
   test/etags/c-src/torture.c
   test/etags/cp-src/MDiagArray2.h
   test/etags/cp-src/Range.h
   test/etags/cp-src/burton.cpp
   test/etags/cp-src/c.C
   test/etags/cp-src/clheir.cpp.gz
   test/etags/cp-src/clheir.hpp
   test/etags/cp-src/conway.cpp
   test/etags/cp-src/conway.hpp
   test/etags/cp-src/fail.C
   test/etags/cp-src/functions.cpp
   test/etags/cp-src/screen.cpp
   test/etags/cp-src/screen.hpp
   test/etags/cp-src/x.cc
   test/etags/el-src/TAGTEST.EL
   test/etags/el-src/emacs/lisp/progmodes/etags.el
   test/etags/erl-src/gs_dialog.erl
   test/etags/f-src/entry.for
   test/etags/f-src/entry.strange.gz
   test/etags/f-src/entry.strange_suffix
   test/etags/forth-src/test-forth.fth
   test/etags/html-src/algrthms.html
   test/etags/html-src/index.shtml
   test/etags/html-src/software.html
   test/etags/html-src/softwarelibero.html
   test/etags/lua-src/allegro.lua
   test/etags/objc-src/PackInsp.h
   test/etags/objc-src/PackInsp.m
   test/etags/objc-src/Subprocess.h
   test/etags/objc-src/Subprocess.m
   test/etags/objcpp-src/SimpleCalc.H
   test/etags/objcpp-src/SimpleCalc.M
   test/etags/pas-src/common.pas
   test/etags/perl-src/htlmify-cystic
   test/etags/perl-src/kai-test.pl
   test/etags/perl-src/yagrip.pl
   test/etags/php-src/lce_functions.php
   test/etags/php-src/ptest.php
   test/etags/php-src/sendmail.php
   test/etags/prol-src/natded.prolog
   test/etags/prol-src/ordsets.prolog
   test/etags/ps-src/rfc1245.ps
   test/etags/pyt-src/server.py
   test/etags/tex-src/gzip.texi
   test/etags/tex-src/nonewline.tex
   test/etags/tex-src/testenv.tex
   test/etags/tex-src/texinfo.tex
   test/etags/y-src/atest.y
   test/etags/y-src/cccp.c
   test/etags/y-src/cccp.y
   test/etags/y-src/parse.c
   test/etags/y-src/parse.y
   test/indent/css-mode.css
   test/indent/js-indent-init-dynamic.js
   test/indent/js-indent-init-t.js
   test/indent/js-jsx.js
   test/indent/js.js
   test/indent/latex-mode.tex
   test/indent/modula2.mod
   test/indent/nxml.xml
   test/indent/octave.m
   test/indent/pascal.pas
   test/indent/perl.perl
   test/indent/prolog.prolog
   test/indent/ps-mode.ps
   test/indent/ruby.rb
   test/indent/scheme.scm
   test/indent/scss-mode.scss
   test/indent/sgml-mode-attribute.html
   test/indent/shell.rc
   test/indent/shell.sh
   test/redisplay-testsuite.el
   test/rmailmm.el
   test/automated/buffer-tests.el
   test/automated/cmds-tests.el
   test/automated/data-tests.el
   test/automated/finalizer-tests.el
   test/automated/fns-tests.el
   test/automated/inotify-test.el
   test/automated/keymap-tests.el
   test/automated/print-tests.el
   test/automated/libxml-tests.el
   test/automated/zlib-tests.el: Files Moved.

1 files changed, 0 insertions, 349 deletions

diff --git a/test/automated/decoder-tests.el b/test/automated/decoder-tests.el
deleted file mode 100644
index 80ff5205ac5..00000000000
--- a/test/automated/decoder-tests.el
+++ /dev/null
@@ -1,349 +0,0 @@
-;;; decoder-tests.el --- test for text decoder
-
-;; Copyright (C) 2013-2015 Free Software Foundation, Inc.
-
-;; Author: Kenichi Handa <handa@gnu.org>
-
-;; This file is part of GNU Emacs.
-
-;; GNU Emacs 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.
-
-;; GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Code:
-
-(require 'ert)
-
-;; Directory to hold test data files.
-(defvar decoder-tests-workdir
-  (expand-file-name "decoder-tests" temporary-file-directory))
-
-;; Remove all generated test files.
-(defun decoder-tests-remove-files ()
-  (delete-directory decoder-tests-workdir t))
-
-;; Return the contents (specified by CONTENT-TYPE; ascii, latin, or
-;; binary) of a test file.
-(defun decoder-tests-file-contents (content-type)
-  (let* ((ascii "ABCDEFGHIJKLMNOPQRSTUVWXYZ\n")
-	 (latin (concat ascii "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ\n"))
-	 (binary (string-to-multibyte
-		  (concat (string-as-unibyte latin)
-			  (unibyte-string #xC0 #xC1 ?\n)))))
-    (cond ((eq content-type 'ascii) ascii)
-	  ((eq content-type 'latin) latin)
-	  ((eq content-type 'binary) binary)
-	  (t
-	   (error "Invalid file content type: %s" content-type)))))
-
-;; Generate FILE with CONTENTS encoded by CODING-SYSTEM.
-;; whose encoding specified by CODING-SYSTEM.
-(defun decoder-tests-gen-file (file contents coding-system)
-  (or (file-directory-p decoder-tests-workdir)
-      (mkdir decoder-tests-workdir t))
-  (setq file (expand-file-name file decoder-tests-workdir))
-  (with-temp-file file
-    (set-buffer-file-coding-system coding-system)
-    (insert contents))
-  file)
-
-;;; The following three functions are filters for contents of a test
-;;; file.
-
-;; Convert all LFs to CR LF sequences in the string STR.
-(defun decoder-tests-lf-to-crlf (str)
-  (with-temp-buffer
-    (insert str)
-    (goto-char (point-min))
-    (while (search-forward "\n" nil t)
-      (delete-char -1)
-      (insert "\r\n"))
-    (buffer-string)))
-
-;; Convert all LFs to CRs in the string STR.
-(defun decoder-tests-lf-to-cr (str)
-  (with-temp-buffer
-    (insert str)
-    (subst-char-in-region (point-min) (point-max) ?\n ?\r)
-    (buffer-string)))
-
-;; Convert all LFs to LF LF sequences in the string STR.
-(defun decoder-tests-lf-to-lflf (str)
-  (with-temp-buffer
-    (insert str)
-    (goto-char (point-min))
-    (while (search-forward "\n" nil t)
-      (insert "\n"))
-    (buffer-string)))
-
-;; Prepend the UTF-8 BOM to STR.
-(defun decoder-tests-add-bom (str)
-  (concat "\xfeff" str))
-
-;; Return the name of test file whose contents specified by
-;; CONTENT-TYPE and whose encoding specified by CODING-SYSTEM.
-(defun decoder-tests-filename (content-type coding-system &optional ext)
-  (if ext
-      (expand-file-name (format "%s-%s.%s" content-type coding-system ext)
-			decoder-tests-workdir)
-    (expand-file-name (format "%s-%s" content-type coding-system)
-		      decoder-tests-workdir)))
-
-
-;;; Check ASCII optimizing decoder
-
-;; Generate a test file whose contents specified by CONTENT-TYPE and
-;; whose encoding specified by CODING-SYSTEM.
-(defun decoder-tests-ao-gen-file (content-type coding-system)
-  (let ((file (decoder-tests-filename content-type coding-system)))
-    (decoder-tests-gen-file file 
-			    (decoder-tests-file-contents content-type)
-			    coding-system)))
-
-;; Test the decoding of a file whose contents and encoding are
-;; specified by CONTENT-TYPE and WRITE-CODING.  The test passes if the
-;; file is read by READ-CODING and detected as DETECTED-CODING and the
-;; contents is correctly decoded.
-;; Optional 5th arg TRANSLATOR is a function to translate the original
-;; file contents to match with the expected result of decoding.  For
-;; instance, when a file of dos eol-type is read by unix eol-type,
-;; `decode-test-lf-to-crlf' must be specified.
-
-(defun decoder-tests (content-type write-coding read-coding detected-coding
-				   &optional translator)
-  (prefer-coding-system 'utf-8-auto)
-  (let ((filename (decoder-tests-filename content-type write-coding)))
-    (with-temp-buffer
-      (let ((coding-system-for-read read-coding)
-	    (contents (decoder-tests-file-contents content-type))
-	    (disable-ascii-optimization nil))
-	(if translator
-	    (setq contents (funcall translator contents)))
-	(insert-file-contents filename)
-	(if (and (coding-system-equal buffer-file-coding-system detected-coding)
-		 (string= (buffer-string) contents))
-	    nil
-	  (list buffer-file-coding-system
-		(string-to-list (buffer-string))
-		(string-to-list contents)))))))
-
-(ert-deftest ert-test-decoder-ascii ()
-  (unwind-protect
-      (progn
-	(dolist (eol-type '(unix dos mac))
-	  (decoder-tests-ao-gen-file 'ascii eol-type))
-	(should-not (decoder-tests 'ascii 'unix 'undecided 'unix))
-	(should-not (decoder-tests 'ascii 'dos 'undecided 'dos))
-	(should-not (decoder-tests 'ascii 'dos 'dos 'dos))
-	(should-not (decoder-tests 'ascii 'mac 'undecided 'mac))
-	(should-not (decoder-tests 'ascii 'mac 'mac 'mac))
-	(should-not (decoder-tests 'ascii 'dos 'utf-8 'utf-8-dos))
-	(should-not (decoder-tests 'ascii 'dos 'unix 'unix
-				   'decoder-tests-lf-to-crlf))
-	(should-not (decoder-tests 'ascii 'mac 'dos 'dos
-				   'decoder-tests-lf-to-cr))
-	(should-not (decoder-tests 'ascii 'dos 'mac 'mac
-				   'decoder-tests-lf-to-lflf)))
-    (decoder-tests-remove-files)))
-
-(ert-deftest ert-test-decoder-latin ()
-  (unwind-protect
-      (progn
-	(dolist (coding '("utf-8" "utf-8-with-signature"))
-	  (dolist (eol-type '("unix" "dos" "mac"))
-	    (decoder-tests-ao-gen-file 'latin
-				       (intern (concat coding "-" eol-type)))))
-	(should-not (decoder-tests 'latin 'utf-8-unix 'undecided 'utf-8-unix))
-	(should-not (decoder-tests 'latin 'utf-8-unix 'utf-8-unix 'utf-8-unix))
-	(should-not (decoder-tests 'latin 'utf-8-dos 'undecided 'utf-8-dos))
-	(should-not (decoder-tests 'latin 'utf-8-dos 'utf-8-dos 'utf-8-dos))
-	(should-not (decoder-tests 'latin 'utf-8-mac 'undecided 'utf-8-mac))
-	(should-not (decoder-tests 'latin 'utf-8-mac 'utf-8-mac 'utf-8-mac))
-	(should-not (decoder-tests 'latin 'utf-8-dos 'unix 'utf-8-unix
-				   'decoder-tests-lf-to-crlf))
-	(should-not (decoder-tests 'latin 'utf-8-mac 'dos 'utf-8-dos
-				   'decoder-tests-lf-to-cr))
-	(should-not (decoder-tests 'latin 'utf-8-dos 'mac 'utf-8-mac
-				   'decoder-tests-lf-to-lflf))
-	(should-not (decoder-tests 'latin 'utf-8-with-signature-unix 'undecided
-				   'utf-8-with-signature-unix))
-	(should-not (decoder-tests 'latin 'utf-8-with-signature-unix 'utf-8-auto
-				   'utf-8-with-signature-unix))
-	(should-not (decoder-tests 'latin 'utf-8-with-signature-dos 'undecided
-				   'utf-8-with-signature-dos))
-	(should-not (decoder-tests 'latin 'utf-8-with-signature-unix 'utf-8
-				   'utf-8-unix 'decoder-tests-add-bom))
-	(should-not (decoder-tests 'latin 'utf-8-with-signature-unix 'utf-8
-				   'utf-8-unix 'decoder-tests-add-bom)))
-    (decoder-tests-remove-files)))
-
-(ert-deftest ert-test-decoder-binary ()
-  (unwind-protect
-      (progn
-	(dolist (eol-type '("unix" "dos" "mac"))
-	  (decoder-tests-ao-gen-file 'binary
-				     (intern (concat "raw-text" "-" eol-type))))
-	(should-not (decoder-tests 'binary 'raw-text-unix 'undecided
-				   'raw-text-unix))
-	(should-not (decoder-tests 'binary 'raw-text-dos 'undecided
-				   'raw-text-dos))
-	(should-not (decoder-tests 'binary 'raw-text-mac 'undecided
-				   'raw-text-mac))
-	(should-not (decoder-tests 'binary 'raw-text-dos 'unix
-				   'raw-text-unix 'decoder-tests-lf-to-crlf))
-	(should-not (decoder-tests 'binary 'raw-text-mac 'dos
-				   'raw-text-dos 'decoder-tests-lf-to-cr))
-	(should-not (decoder-tests 'binary 'raw-text-dos 'mac
-				   'raw-text-mac 'decoder-tests-lf-to-lflf)))
-    (decoder-tests-remove-files)))
-
-
-;;; Check the coding system `prefer-utf-8'.
-
-;; Read FILE.  Check if the encoding was detected as DETECT.  If
-;; PREFER is non-nil, prefer that coding system before reading.
-
-(defun decoder-tests-prefer-utf-8-read (file detect prefer)
-  (with-temp-buffer
-    (with-coding-priority (if prefer (list prefer))
-      (insert-file-contents file))
-    (if (eq buffer-file-coding-system detect)
-	nil
-      (format "Invalid detection: %s" buffer-file-coding-system))))
-
-;; Read FILE, modify it, and write it.  Check if the coding system
-;; used for writing was CODING.  If CODING-TAG is non-nil, insert
-;; coding tag with it before writing.  If STR is non-nil, insert it
-;; before writing.
-
-(defun decoder-tests-prefer-utf-8-write (file coding-tag coding
-					      &optional str)
-  (with-temp-buffer
-    (insert-file-contents file)
-    (goto-char (point-min))
-    (if coding-tag
-	(insert (format ";; -*- coding: %s; -*-\n" coding-tag))
-      (insert ";;\n"))
-    (if str
-	(insert str))
-    (write-file (decoder-tests-filename 'test 'test "el"))
-    (if (coding-system-equal buffer-file-coding-system coding)
-	nil
-      (format "Incorrect encoding: %s" last-coding-system-used))))
-
-(ert-deftest ert-test-decoder-prefer-utf-8 ()
-  (unwind-protect
-      (let ((ascii (decoder-tests-gen-file "ascii.el"
-					   (decoder-tests-file-contents 'ascii)
-					   'unix))
-	    (latin (decoder-tests-gen-file "utf-8.el"
-					   (decoder-tests-file-contents 'latin)
-					   'utf-8-unix)))
-	(should-not (decoder-tests-prefer-utf-8-read
-		     ascii 'prefer-utf-8-unix nil))
-	(should-not (decoder-tests-prefer-utf-8-read
-		     latin 'utf-8-unix nil))
-	(should-not (decoder-tests-prefer-utf-8-read
-		     latin 'utf-8-unix 'iso-8859-1))
-	(should-not (decoder-tests-prefer-utf-8-read
-		     latin 'utf-8-unix 'sjis))
-	(should-not (decoder-tests-prefer-utf-8-write
-		     ascii nil 'prefer-utf-8-unix))
-	(should-not (decoder-tests-prefer-utf-8-write
-		     ascii 'iso-8859-1 'iso-8859-1-unix))
-	(should-not (decoder-tests-prefer-utf-8-write
-		     ascii nil 'utf-8-unix "À")))
-    (decoder-tests-remove-files)))
-
-
-;;; The following is for benchmark testing of the new optimized
-;;; decoder, not for regression testing.
-
-(defun generate-ascii-file ()
-  (dotimes (i 100000)
-    (insert-char ?a 80)
-    (insert "\n")))
-
-(defun generate-rarely-nonascii-file ()
-  (dotimes (i 100000)
-    (if (/= i 50000)
-	(insert-char ?a 80)
-      (insert ?À)
-      (insert-char ?a 79))
-    (insert "\n")))
-
-(defun generate-mostly-nonascii-file ()
-  (dotimes (i 30000)
-    (insert-char ?a 80)
-    (insert "\n"))
-  (dotimes (i 20000)
-    (insert-char ?À 80)
-    (insert "\n"))
-  (dotimes (i 10000)
-    (insert-char ?あ 80)
-    (insert "\n")))
-
-
-(defvar test-file-list
-  '((generate-ascii-file
-     ("~/ascii-tag-utf-8-unix.unix" ";; -*- coding: utf-8-unix; -*-" unix)
-     ("~/ascii-tag-utf-8.unix" ";; -*- coding: utf-8; -*-" unix)
-     ("~/ascii-tag-none.unix" "" unix)
-     ("~/ascii-tag-utf-8-dos.dos" ";; -*- coding: utf-8-dos; -*-" dos)
-     ("~/ascii-tag-utf-8.dos" ";; -*- coding: utf-8; -*-" dos)
-     ("~/ascii-tag-none.dos" "" dos))
-    (generate-rarely-nonascii-file
-     ("~/utf-8-r-tag-utf-8-unix.unix" ";; -*- coding: utf-8-unix; -*-" utf-8-unix)
-     ("~/utf-8-r-tag-utf-8.unix" ";; -*- coding: utf-8; -*-" utf-8-unix)
-     ("~/utf-8-r-tag-none.unix" "" utf-8-unix)
-     ("~/utf-8-r-tag-utf-8-dos.dos" ";; -*- coding: utf-8-dos; -*-" utf-8-dos)
-     ("~/utf-8-r-tag-utf-8.dos" ";; -*- coding: utf-8; -*-" utf-8-dos)
-     ("~/utf-8-r-tag-none.dos" "" utf-8-dos))
-    (generate-mostly-nonascii-file
-     ("~/utf-8-m-tag-utf-8-unix.unix" ";; -*- coding: utf-8-unix; -*-" utf-8-unix)
-     ("~/utf-8-m-tag-utf-8.unix" ";; -*- coding: utf-8; -*-" utf-8-unix)
-     ("~/utf-8-m-tag-none.unix" "" utf-8-unix)
-     ("~/utf-8-m-tag-utf-8-dos.dos" ";; -*- coding: utf-8-dos; -*-" utf-8-dos)
-     ("~/utf-8-m-tag-utf-8.dos" ";; -*- coding: utf-8; -*-" utf-8-dos)
-     ("~/utf-8-m-tag-none.dos" "" utf-8-dos))))
-
-(defun generate-benchmark-test-file ()
-  (interactive)
-  (with-temp-buffer
-    (message "Generating data...")
-    (dolist (files test-file-list)
-      (delete-region (point-min) (point-max))
-      (funcall (car files))
-      (dolist (file (cdr files))
-	(message "Writing %s..." (car file))
-	(goto-char (point-min))
-	(insert (nth 1 file) "\n")
-	(let ((coding-system-for-write (nth 2 file)))
-	  (write-region (point-min) (point-max) (car file)))
-	(delete-region (point-min) (point))))))
-
-(defun benchmark-decoder ()
-  (let ((gc-cons-threshold 4000000))
-    (insert "Without optimization:\n")
-    (dolist (files test-file-list)
-      (dolist (file (cdr files))
-	(let* ((disable-ascii-optimization t)
-	       (result (benchmark-run 10
-			 (with-temp-buffer (insert-file-contents (car file))))))
-	  (insert (format "%s: %s\n"  (car file) result)))))
-    (insert "With optimization:\n")
-    (dolist (files test-file-list)
-      (dolist (file (cdr files))
-	(let* ((disable-ascii-optimization nil)
-	       (result (benchmark-run 10
-			 (with-temp-buffer (insert-file-contents (car file))))))
-	  (insert (format "%s: %s\n" (car file) result)))))))