25726495 Update tcsh to version 6.20.00
authorRich Burridge <rich.burridge@oracle.com>
Wed, 19 Apr 2017 08:36:33 -0700
changeset 7912 1d7536fc48b3
parent 7911 5fa77fa8c6ed
child 7913 bb445390447b
25726495 Update tcsh to version 6.20.00
components/tcsh/Makefile
components/tcsh/patches/001.man.patch
components/tcsh/patches/004.amd64.patch
components/tcsh/patches/007.heredoc.patch
components/tcsh/patches/008.config.patch
components/tcsh/patches/009.completion.patch
components/tcsh/tcsh.license
components/tcsh/tcsh.p5m
components/tcsh/test/results-64.master
--- a/components/tcsh/Makefile	Tue Apr 04 05:15:38 2017 -0700
+++ b/components/tcsh/Makefile	Wed Apr 19 08:36:33 2017 -0700
@@ -26,15 +26,15 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tcsh
-COMPONENT_VERSION=	6.19.00
-IPS_COMPONENT_VERSION=	6.19.0
+COMPONENT_VERSION=	6.20.00
+IPS_COMPONENT_VERSION=	6.20.0
 COMPONENT_PROJECT_URL=	http://www.tcsh.org/
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:12e271e0b89e4259d9d6e8d525322e77340e7244cfbd199a591e5f8146285c49
+    sha256:b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d
 COMPONENT_ARCHIVE_URL=	ftp://ftp.astron.com/pub/tcsh/$(COMPONENT_ARCHIVE)
 COMPONENT_ANITYA_ID=	4945
 
-TPNO=			24443
+TPNO=			34278
 
 # the testsuite needs to be configured first
 SYSTEM_TEST_TARGET= configure $(SYSTEM_TEST_64)
@@ -57,12 +57,13 @@
 COMPONENT_TEST_ENV += PATH=$(GNUBIN):$(USRBINDIR)
 COMPONENT_SYSTEM_TEST_TARGETS= system-test
 
-# Strip compilation lines from test output
 COMPONENT_TEST_TRANSFORMS += \
-	'-e "s|^.*$(CC).*$$|XXX_CC_XXX|g" ' \
-	'-e "s|^.*$(CXX).*$$|XXX_CC_XXX|g" ' \
-	'-e "s|^make.*: Leaving directory.*$$|XXX_CC_XXX|g" ' \
-	'-e "s|^make.*: Entering directory.*$$|XXX_CC_XXX|g" ' \
-	'-e "/^XXX_CC_XXX$$/d" '
+	'-n ' \
+	'-e "/skipped/p" ' \
+	'-e "/ok/p" ' \
+	'-e "/FAILED/p" ' \
+	'-e "/expected failure/p" ' \
+	'-e "/Test results/p" ' \
+	'-e "/successful/p" '
 
 REQUIRED_PACKAGES += text/locale
--- a/components/tcsh/patches/001.man.patch	Tue Apr 04 05:15:38 2017 -0700
+++ b/components/tcsh/patches/001.man.patch	Wed Apr 19 08:36:33 2017 -0700
@@ -1,16 +1,20 @@
---- tcsh-6.19.00/tcsh.man.orig	Tue May 26 12:16:43 2015
-+++ tcsh-6.19.00/tcsh.man	Tue May 26 12:16:55 2015
[email protected]@ -77,6 +77,9 @@
+Changes to the tcsh man specific to Solaris.
+
+These changes will not be sent upstream.
+
+--- tcsh-6.20.00/tcsh.man.orig	2017-03-15 07:57:56.786489271 +0000
++++ tcsh-6.20.00/tcsh.man	2017-03-15 07:59:19.157374928 +0000
[email protected]@ -78,6 +78,9 @@
  .\"   used here if you can. In particular, please don't use nroff commands
  .\"   which aren't already used herein.
  .\" 
 +.\" modified to reference existing Solaris man pages, to add the Solaris
 +.\" stability classification, and to add a note about source availability.
 +.\"
- .TH TCSH 1 "21 May 2015" "Astron 6.19.00"
+ .TH TCSH 1 "24 November 2016" "Astron 6.20.00"
  .SH NAME
  tcsh \- C shell with file name completion and command line editing
[email protected]@ -151,7 +154,7 @@
[email protected]@ -152,7 +155,7 @@
  .TP 4
  .B \-m
  The shell loads \fI~/.tcshrc\fR even if it does not belong to the effective
@@ -19,7 +23,7 @@
  .TP 4
  .B \-n
  The shell parses commands but does not execute them.
[email protected]@ -202,7 +205,7 @@
[email protected]@ -203,7 +206,7 @@
  Remaining arguments are placed in the \fBargv\fR shell variable.
  .SS "Startup and shutdown"
  A login shell begins by executing commands from the system files
@@ -28,7 +32,7 @@
  It then executes commands from files in the user's \fBhome\fR directory:
  first \fI~/.tcshrc\fR (+)
  or, if \fI~/.tcshrc\fR is not found, \fI~/.cshrc\fR,
[email protected]@ -210,17 +213,17 @@
[email protected]@ -211,17 +214,17 @@
  then \fI~/.login\fR,
  and finally \fI~/.cshdirs\fR (or the value of the \fBdirsfile\fR shell variable) (+).
  The shell may read \fI/etc/csh.login\fR before instead of after
@@ -49,7 +53,7 @@
  which need be run only once per login, usually go in one's \fI~/.login\fR file.
  Users who need to use the same set of files with both \fIcsh\fR(1) and
  \fItcsh\fR can have only a \fI~/.cshrc\fR which checks for the existence of the
[email protected]@ -1974,7 +1977,7 @@
[email protected]@ -2040,7 +2043,7 @@
  and changing the \fBLANG\fR or \fBLC_CTYPE\fR environment variables
  causes a check for possible changes in these respects.
  .PP
@@ -58,7 +62,7 @@
  to determine appropriate character code/classification and sorting
  (e.g., a 'en_CA.UTF-8' would yield "UTF-8" as a character code).
  This function typically examines the \fBLANG\fR and \fBLC_CTYPE\fR
[email protected]@ -2672,7 +2675,7 @@
[email protected]@ -2741,7 +2744,7 @@
  sequences of the BSD and/or System V versions of \fIecho\fR; see \fIecho\fR(1).
  .TP 8
  .B echotc \fR[\fB\-sv\fR] \fIarg\fR ... (+)
@@ -67,7 +71,7 @@
  For example, 'echotc home' sends the cursor to the home position,
  \&'echotc cm 3 10' sends it to column 3 and row 10, and
  \&'echotc ts 0; echo "This is a test."; echotc fs' prints "This is a test."
[email protected]@ -2723,7 +2726,7 @@
[email protected]@ -2792,7 +2795,7 @@
  of the current shell.  This is usually used to execute commands
  generated as the result of command or variable substitution,
  because parsing occurs before these substitutions.
@@ -76,7 +80,7 @@
  .TP 8
  .B exec \fIcommand\fR
  Executes the specified command in place of the current shell.
[email protected]@ -3331,7 +3334,7 @@
[email protected]@ -3400,7 +3403,7 @@
  .TP 8
  .B settc \fIcap value \fR(+)
  Tells the shell to believe that the terminal capability \fIcap\fR
@@ -85,7 +89,7 @@
  No sanity checking is done.
  Concept terminal users may have to `settc xn no' to get proper
  wrapping at the rightmost column.
[email protected]@ -3384,7 +3387,7 @@
[email protected]@ -3453,7 +3456,7 @@
  .B suspend
  Causes the shell to stop in its tracks, much as if it had
  been sent a stop signal with \fB^Z\fR.  This is most often used to
@@ -94,7 +98,7 @@
  .PP
  .B switch (\fIstring\fB)
  .br
[email protected]@ -3418,12 +3421,12 @@
[email protected]@ -3487,11 +3490,11 @@
  .PD
  .TP 8
  .B telltc \fR(+)
@@ -104,13 +108,11 @@
  .B termname \fR[\fIterminal type\fR] \fR(+)
  Tests if \fIterminal type\fR (or the current value of \fBTERM\fR if no
 -\fIterminal type\fR is given) has an entry in the hosts termcap(5) or
--terminfo(5) database. Prints the terminal type to stdout and returns 0
 +\fIterminal type\fR is given) has an entry in the hosts
-+terminfo(5) database. Prints the terminal type to stdout and returns 0
+ terminfo(5) database. Prints the terminal type to stdout and returns 0
  if an entry is present otherwise returns 1.
  .TP 8
- .B time \fR[\fIcommand\fR]
[email protected]@ -4655,8 +4658,8 @@
[email protected]@ -4729,8 +4732,8 @@
  The system's NLS is used; default for systems with NLS
  .TP 6
  lf
@@ -121,7 +123,7 @@
  \fI~/.tcshrc\fR and \fI~/.history\fR.
  .TP 6
  dl
[email protected]@ -4683,7 +4686,7 @@
[email protected]@ -4757,7 +4760,7 @@
  unless the \fBnokanji\fR shell variable is set
  .TP 6
  sm
@@ -130,7 +132,7 @@
  .TP 6
  hb
  The `#!<program> <args>' convention is emulated when executing shell scripts
[email protected]@ -4760,7 +4763,8 @@
[email protected]@ -4851,7 +4854,8 @@
  .PD
  .PP
  %M and %m are available on only systems that store the remote hostname in
@@ -140,7 +142,7 @@
  If unset, `%n has %a %l from %m.' is used, or `%n has %a %l.' on systems
  which don't store the remote hostname.
  .RE
[email protected]@ -4778,7 +4782,7 @@
[email protected]@ -4871,7 +4875,7 @@
  The number of columns in the terminal.  See \fBTerminal management\fR.
  .TP 8
  .B DISPLAY
@@ -149,7 +151,7 @@
  If set, the shell does not set \fBautologout\fR (q.v.).
  .TP 8
  .B EDITOR
[email protected]@ -4794,7 +4798,7 @@
[email protected]@ -4888,7 +4892,7 @@
  .TP 8
  .B HOST \fR(+)
  Initialized to the name of the machine on which the shell
@@ -158,7 +160,7 @@
  .TP 8
  .B HOSTTYPE \fR(+)
  Initialized to the type of machine on which the shell
[email protected]@ -5031,7 +5035,7 @@
[email protected]@ -5126,7 +5130,7 @@
  NeXTs use \fI/etc/cshrc.std\fR.
  A/UX, AMIX, Cray and IRIX have no equivalent in \fIcsh\fR(1),
  but read this file in \fItcsh\fR anyway.
@@ -167,7 +169,7 @@
  .TP 16
  .I /etc/csh.login
  Read by login shells after \fI/etc/csh.cshrc\fR.
[email protected]@ -5237,11 +5241,11 @@
[email protected]@ -5333,11 +5337,11 @@
  To detect looping, the shell restricts the number of \fIalias\fR
  substitutions on a single line to 20.
  .SH "SEE ALSO"
@@ -182,9 +184,9 @@
 +malloc(3C), setlocale(3C), tty(7D), a.out(4), terminfo(5), environ(7),
 +termio(7I), Introduction to the C Shell
  .SH VERSION
- This manual documents tcsh 6.19.00 (Astron) 2015-05-21.
+ This manual documents tcsh 6.20.00 (Astron) 2016-11-24.
  .SH AUTHORS
[email protected]@ -5420,3 +5424,9 @@
[email protected]@ -5516,3 +5520,9 @@
  reporting bugs in, and suggesting new additions to each and every version
  .PP
  Richard M. Alderson III, for writing the `T in tcsh' section
--- a/components/tcsh/patches/004.amd64.patch	Tue Apr 04 05:15:38 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- tcsh-6.19.00/host.defs.orig	Tue May 26 11:13:32 2015
-+++ tcsh-6.19.00/host.defs	Tue May 26 11:14:30 2015
[email protected]@ -347,7 +347,7 @@
- machtype: defined(sparcv9)				: "sparcv9"
- machtype: defined(sparc)				: "sparc"
- machtype: defined(M_i386)				: "i386"
--machtype: defined(M_amd64)				: "x86_64"
-+machtype: defined(M_amd64)				: "amd64"
- enddef	:
- 
- 
--- a/components/tcsh/patches/007.heredoc.patch	Tue Apr 04 05:15:38 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-Developed in-house but accepted upstream.
-
---- tcsh-6.19.00/sh.sem.c.orig	Sat Oct 31 10:58:21 2015
-+++ tcsh-6.19.00/sh.sem.c	Sat Oct 31 10:59:42 2015
[email protected]@ -212,8 +212,14 @@
- 	 * If noexec then this is all we do.
- 	 */
- 	if (t->t_dflg & F_READ) {
-+	    int	old_pintr_disabled;
-+	    
- 	    xclose(0);
-+	    if (setintr)
-+	        pintr_push_enable(&old_pintr_disabled);
- 	    heredoc(t->t_dlef);
-+	    if (setintr)
-+	        cleanup_until(&old_pintr_disabled);
- 	    if (noexec)
- 		xclose(0);
- 	}
--- a/components/tcsh/patches/008.config.patch	Tue Apr 04 05:15:38 2017 -0700
+++ b/components/tcsh/patches/008.config.patch	Wed Apr 19 08:36:33 2017 -0700
@@ -3,14 +3,14 @@
 entirely sure this should be changed upstream
 yet.
 
---- tcsh-6.19.00/config_f.h.orig	Mon Sep 14 12:18:26 2015
-+++ tcsh-6.19.00/config_f.h	Mon Sep 14 12:18:46 2015
[email protected]@ -135,7 +135,7 @@
+--- tcsh-6.20.00/config_f.h.orig	2017-03-15 08:08:19.022087866 +0000
++++ tcsh-6.20.00/config_f.h	2017-03-15 08:08:38.113623812 +0000
[email protected]@ -139,7 +139,7 @@
   *		This can be much slower and no memory statistics will be
   *		provided.
   */
--#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__)
-+#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined(SOLARIS2)
+-#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__)
++#if defined(__MACHTEN__) || defined(PURIFY) || defined(MALLOC_TRACE) || defined(_OSD_POSIX) || defined(__MVS__) || defined (__CYGWIN__) || defined(__GLIBC__) || defined(__OpenBSD__) || defined(__APPLE__) || defined (__ANDROID__) || defined(SOLARIS2)
  # define SYSMALLOC
  #else
  # undef SYSMALLOC
--- a/components/tcsh/patches/009.completion.patch	Tue Apr 04 05:15:38 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-this is from upstream. described by:
-
-http://mx.gw.com/pipermail/tcsh-bugs/2015-September/000978.html
-
-and fixed by:
-
-https://github.com/tcsh-org/tcsh/commit/86f1ca6000f81be5b3401a2ec102521cb612a518
-
---- tcsh-6.19.00/tw.comp.c.orig	Wed Feb  3 14:07:50 2016
-+++ tcsh-6.19.00/tw.comp.c	Wed Feb  3 14:08:18 2016
[email protected]@ -251,7 +251,7 @@
- tw_match(const Char *str, const Char *pat, int exact)
- {
-     const Char *estr;
--    int rv = exact ? Gmatch(str, pat) : Gnmatch(str, pat, &estr);
-+    int rv = exact ? Gmatch(estr = str, pat) : Gnmatch(str, pat, &estr);
- #ifdef TDEBUG
-     xprintf("G%smatch(%s, ", exact ? "" : "n", short2str(str));
-     xprintf("%s, ", short2str(pat));
--- a/components/tcsh/tcsh.license	Tue Apr 04 05:15:38 2017 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,32 +0,0 @@
-/*-
- * Copyright (c) 1980, 1991 The Regents of the University of California.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
--- a/components/tcsh/tcsh.p5m	Tue Apr 04 05:15:38 2017 -0700
+++ b/components/tcsh/tcsh.p5m	Wed Apr 19 08:36:33 2017 -0700
@@ -37,18 +37,17 @@
 $(SOLARIS_11_4_ONLY)link path=usr/bin/csh target=tcsh mediator=csh \
     mediator-implementation=tcsh
 file path=usr/bin/tcsh
-file $(MACH64)/nls/german.cat path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/greek.cat path=usr/share/locale/el/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/spanish.cat path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/et.cat path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/finnish.cat path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/french.cat path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/italian.cat path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/ja.cat path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/pl.cat path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/russian.cat path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
-file $(MACH64)/nls/ukrainian.cat path=usr/share/locale/uk/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/C/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/de/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/es/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/et/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/fi/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/fr/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/gr/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/it/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/ja/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/pl/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/ru/LC_MESSAGES/tcsh.cat
+file path=usr/share/locale/ru_UA/LC_MESSAGES/tcsh.cat
 file path=usr/share/man/man1/tcsh.1
-legacy pkg=SUNWtcsh desc="Tenex C-shell (tcsh)" name="Tenex C-shell (tcsh)"
-license tcsh.license license=BSD
-
+license Copyright license=BSD
--- a/components/tcsh/test/results-64.master	Tue Apr 04 05:15:38 2017 -0700
+++ b/components/tcsh/test/results-64.master	Wed Apr 19 08:36:33 2017 -0700
@@ -1,18 +1,3 @@
-{								   \
-  echo '# Signature of the current package.';			   \
-  echo 'm4_define([AT_PACKAGE_NAME],      [tcsh])';	   \
-  echo 'm4_define([AT_PACKAGE_TARNAME],   [tcsh])';   \
-  echo 'm4_define([AT_PACKAGE_VERSION],   [6.19.00])';   \
-  echo 'm4_define([AT_PACKAGE_STRING],    [tcsh 6.19.00])';	   \
-  echo 'm4_define([AT_PACKAGE_BUGREPORT], [http://bugs.gw.com/])'; \
-} >$(SOURCE_DIR)/tests/package.m4
-autom4te --language=autotest -I $(SOURCE_DIR)/tests \
-	$(SOURCE_DIR)/tests/testsuite.at -o $(SOURCE_DIR)/tests/testsuite.tmp
-mv $(SOURCE_DIR)/tests/testsuite.tmp $(SOURCE_DIR)/tests/testsuite
-/bin/sh $(SOURCE_DIR)/tests/testsuite
-## ------------------------ ##
-## tcsh 6.19.00 test suite. ##
-## ------------------------ ##
   1: beepcmd                                         skipped (aliases.at:3)
   2: cwdcmd                                          ok
   3: jobcmd                                          skipped (aliases.at:19)
@@ -121,127 +106,131 @@
 106: where                                           ok
 107: which                                           ok
 108: while                                           ok
-109: Arithmetic operators                            ok
-110: Primary expressions                             ok
-111: Word splitting                                  ok
-112: Comments                                        skipped (lexical.at:33)
-113: Escaping special characters                     ok
-114: Preventing substitution                         ok
-115: History basics                                  ok
-116: Event specification                             ok
-117: Word selection                                  ok
-118: History modifiers                               ok
-119: Alias substitution                              ok
-120: Variable substitution                           ok
-121: EUC-JP multibyte test                           ok
-122: UTF-8 multibyte test                            ok
-123: Command substitution                            ok
-124: Filename substitution                           ok
-125: Directory stack substitution                    ok
-126: Command combinations                            ok
-127: Command execution                               ok
-128: $ addsuffix                                     ok
-129: $ afsuser                                       ok
-130: $ ampm                                          ok
-131: $ anyerror                                      ok
-132: $ argv                                          ok
-133: $ autocorrect                                   ok
-134: $ autoexpand                                    ok
-135: $ autolist                                      ok
-136: $ autologout                                    skipped (variables.at:77)
-137: $ backslash_quote                               ok
-138: $ catalog                                       ok
-139: $ cdpath                                        ok
-140: $ color                                         ok
-141: $ colorcat                                      ok
-142: $ command                                       ok
-143: $ complete                                      ok
-144: $ continue                                      ok
-145: $ continue_args                                 ok
-146: $ correct                                       ok
-147: $ csubstnonl                                    ok
-148: $ cwd                                           ok
-149: $ dextract                                      ok
-150: $ dirsfile                                      ok
-151: $ dirstack                                      ok
-152: $ dspmbyte                                      skipped (variables.at:276)
-153: $ dunique                                       ok
-154: $ echo                                          ok
-155: $ echo_style                                    ok
-156: $ edit                                          skipped (variables.at:344)
-157: $ ellipsis                                      ok
-158: $ fignore                                       ok
-159: $ filec                                         ok
-160: $ gid                                           ok
-161: $ group                                         ok
-162: $ histchars                                     ok
-163: $ histdup                                       ok
-164: $ histfile                                      ok
-165: $ histlit                                       ok
-166: $ history                                       ok
-167: $ home                                          ok
-168: $ ignoreeof                                     ok
-169: $ implicitcd                                    ok
-170: $ inputmode                                     ok
-171: $ killdup                                       ok
-172: $ killring                                      ok
-173: $ listflags                                     ok
-174: $ listjobs                                      ok
-175: $ listlinks                                     ok
-176: $ listmax                                       ok
-177: $ listmaxrows                                   ok
-178: $ loginsh                                       ok
-179: $ logout                                        ok
-180: $ mail                                          ok
-181: $ cdtohome                                      ok
-182: $ noimplicithome                                ok
-183: $ matchbeep                                     ok
-184: $ nobeep                                        ok
-185: $ noclobber                                     ok
-186: $ noding                                        ok
-187: $ noglob                                        ok
-188: $ nostat                                        ok
-189: $ notify                                        ok
-190: $ oid                                           skipped (variables.at:725)
-191: $ owd                                           ok
-192: $ path                                          ok
-193: $ printexitvalue                                ok
-194: $ prompt                                        ok
-195: $ prompt2                                       ok
-196: $ prompt3                                       ok
-197: $ promptchars                                   ok
-198: $ pushdtohome                                   ok
-199: $ pushdsilent                                   ok
-200: $ recexact                                      ok
-201: $ recognize_only_executablers                   ok
-202: $ rmstar                                        ok
-203: $ rprompt                                       ok
-204: $ savedirs                                      ok
-205: $ savehist                                      ok
-206: $ sched                                         ok
-207: $ shell                                         ok
-208: $ shlvl                                         ok
-209: $ status                                        ok
-210: $ symlinks                                      ok
-211: $ tcsh                                          ok
-212: $ term                                          ok
-213: $ time                                          ok
-214: $ tperiod                                       ok
-215: $ tty                                           ok
-216: $ uid                                           ok
-217: $ user                                          ok
-218: $ verbose                                       ok
-219: $ version                                       ok
-220: $ visiblebell                                   ok
-221: $ watch                                         ok
-222: $ who                                           ok
-223: $ wordchars                                     ok
-224: -n                                              ok
-225: $<                                              ok
-
-## ------------- ##
+109: jobs output                                     ok
+110: time output                                     ok
+111: Arithmetic operators                            ok
+112: Primary expressions                             ok
+113: Word splitting                                  ok
+114: Comments                                        skipped (lexical.at:33)
+115: Escaping special characters                     ok
+116: Preventing substitution                         ok
+117: History basics                                  ok
+118: Event specification                             ok
+119: Word selection                                  ok
+120: History modifiers                               ok
+121: Alias substitution                              ok
+122: Variable substitution                           ok
+123: Quoting of expansions in `...`                  ok
+124: \echo for git_tcsh_completion                   ok
+125: EUC-JP multibyte test                           ok
+126: UTF-8 multibyte test                            ok
+127: Parenthesis no space                            ok
+128: Parenthesis space                               ok
+129: Parenthesis space escaped                       ok
+130: Parenthesis escaped                             ok
+131: Command substitution                            ok
+132: Filename substitution                           ok
+133: Directory stack substitution                    ok
+134: Command combinations                            ok
+135: Command execution                               ok
+136: $ addsuffix                                     ok
+137: $ afsuser                                       ok
+138: $ ampm                                          ok
+139: $ anyerror                                      ok
+140: $ argv                                          ok
+141: $ autocorrect                                   ok
+142: $ autoexpand                                    ok
+143: $ autolist                                      ok
+144: $ autologout                                    skipped (variables.at:77)
+145: $ backslash_quote                               ok
+146: $ catalog                                       ok
+147: $ cdpath                                        ok
+148: $ color                                         ok
+149: $ colorcat                                      ok
+150: $ command                                       ok
+151: $ complete                                      ok
+152: $ continue                                      ok
+153: $ continue_args                                 ok
+154: $ correct                                       ok
+155: $ csubstnonl                                    ok
+156: $ cwd                                           ok
+157: $ dextract                                      ok
+158: $ dirsfile                                      ok
+159: $ dirstack                                      ok
+160: $ dspmbyte                                      skipped (variables.at:276)
+161: $ dunique                                       ok
+162: $ echo                                          ok
+163: $ echo_style                                    ok
+164: $ edit                                          skipped (variables.at:344)
+165: $ ellipsis                                      ok
+166: $ fignore                                       ok
+167: $ filec                                         ok
+168: $ gid                                           ok
+169: $ group                                         ok
+170: $ histchars                                     ok
+171: $ histdup                                       ok
+172: $ histfile                                      ok
+173: $ histlit                                       ok
+174: $ history                                       ok
+175: $ home                                          ok
+176: $ ignoreeof                                     ok
+177: $ implicitcd                                    ok
+178: $ inputmode                                     ok
+179: $ killdup                                       ok
+180: $ killring                                      ok
+181: $ listflags                                     ok
+182: $ listjobs                                      ok
+183: $ listlinks                                     ok
+184: $ listmax                                       ok
+185: $ listmaxrows                                   ok
+186: $ loginsh                                       ok
+187: $ logout                                        ok
+188: $ mail                                          ok
+189: $ cdtohome                                      ok
+190: $ noimplicithome                                ok
+191: $ matchbeep                                     ok
+192: $ nobeep                                        ok
+193: $ noclobber                                     ok
+194: $ noding                                        ok
+195: $ noglob                                        ok
+196: $ nostat                                        ok
+197: $ notify                                        ok
+198: $ oid                                           skipped (variables.at:725)
+199: $ owd                                           ok
+200: $ path                                          ok
+201: $ printexitvalue                                ok
+202: $ prompt                                        ok
+203: $ prompt2                                       ok
+204: $ prompt3                                       ok
+205: $ promptchars                                   ok
+206: $ pushdtohome                                   ok
+207: $ pushdsilent                                   ok
+208: $ recexact                                      ok
+209: $ recognize_only_executablers                   ok
+210: $ rmstar                                        ok
+211: $ rprompt                                       ok
+212: $ savedirs                                      ok
+213: $ savehist                                      ok
+214: $ sched                                         ok
+215: $ shell                                         ok
+216: $ shlvl                                         ok
+217: $ status                                        ok
+218: $ symlinks                                      ok
+219: $ tcsh                                          ok
+220: $ term                                          ok
+221: $ time                                          ok
+222: $ tperiod                                       ok
+223: $ tty                                           ok
+224: $ uid                                           ok
+225: $ user                                          ok
+226: $ verbose                                       ok
+227: $ version                                       ok
+228: $ visiblebell                                   ok
+229: $ watch                                         ok
+230: $ who                                           ok
+231: $ wordchars                                     ok
+232: -n                                              ok
+233: $<                                              ok
 ## Test results. ##
-## ------------- ##
-
-171 tests were successful.
+179 tests were successful.
 54 tests were skipped.