TCSH: Update to 6.20.00.

TCSH: Update to 6.20.00.

[ng0]

[PATCH] gnu: tcsh: Update to 6.20.00.

This is almost fixed. Someone needs to look into failing test cases 131 and 188.

The tcsh-fix-autotest.patch was updated.
I compared the 6.19 version with 6.20 version of files and see no obvious reason for these to fail:

#                             -*- compilation -*-
131. subst.at:29: testing Filename substitution ...
./subst.at:44: tcsh -f files.csh
./subst.at:53: echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'
./subst.at:57: echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq    | wc -l | tr -d ' \t'
--- -   2017-01-08 23:36:16.461524744 +0000
+++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/131/stdout  2017-01-08 23:36:16.458666838 +0000
@@ -1,2 +1,2 @@
-1
+2

131. subst.at:29: 131. Filename substitution (subst.at:29): FAILED (subst.at:57)



#                             -*- compilation -*-
188. variables.at:707: testing $ cdtohome ...
./variables.at:708: tcsh -f -c 'cd'
--- /dev/null   2017-01-08 10:27:49.064082136 +0000
+++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/188/stderr  2017-01-08 23:36:18.990679394 +0000
@@ -0,0 +1 @@
+cd: Can't change to home directory.
./variables.at:708: exit code was 1, expected 0
188. variables.at:707: 188. $ cdtohome (variables.at:707): FAILED (variables.at:708)

[PATCH] gnu: tcsh: Update to 6.20.00.

[ng0]

* gnu/packages/shells.scm (tcsh): Update to 6.20.00.
[native-inputs]: Add perl.
* gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Remove it.
---
 gnu/packages/patches/tcsh-fix-autotest.patch | 151 ++-------------------------
 gnu/packages/shells.scm                      |  10 +-
 2 files changed, 15 insertions(+), 146 deletions(-)

diff --git a/gnu/packages/patches/tcsh-fix-autotest.patch b/gnu/packages/patches/tcsh-fix-autotest.patch
index a16980161..555b9151b 100644
--- a/gnu/packages/patches/tcsh-fix-autotest.patch
+++ b/gnu/packages/patches/tcsh-fix-autotest.patch
@@ -1,6 +1,6 @@
---- tests/commands.at	2011-01-22 01:04:02.000000000 +0100
-+++ tests/commands.at	2013-02-04 10:57:24.000000000 +0100
-@@ -919,26 +919,27 @@
+--- tests/commands.at	2016-07-09 00:49:28.000000000 +0000
++++ tests/commands.at	2017-01-08 22:07:46.848337902 +0000
+@@ -921,26 +921,27 @@
  TCSH_UNTESTED([notify])
  
  
@@ -48,27 +48,9 @@
  
  
  AT_SETUP([popd])
-@@ -1203,11 +1204,12 @@
- AT_DATA([script.csh],
- [[set var=$1
- ]])
--AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \
--	   | sed 's/	[^	]*	/ TIME /']], ,
--[     1 TIME source -h script.csh foo ; history
--     2 TIME set var=$1
--])
-+# XXX: Not sure why this fails. The output is : "1 TIME set var=$1"
-+#AT_CHECK([[tcsh -f -c 'source -h script.csh foo; history' \
-+#	   | sed 's/	[^	]*	/ TIME /']], ,
-+#[     1 TIME source -h script.csh foo ; history
-+#     2 TIME set var=$1
-+#])
- 
- AT_CHECK([tcsh -f -c 'source -h script.csh foo; echo $var'], 1, [],
- [var: Undefined variable.
---- tests/lexical.at	2011-12-27 22:50:52.000000000 +0100
-+++ tests/lexical.at	2013-02-04 10:53:21.000000000 +0100
-@@ -33,9 +33,9 @@
+--- tests/lexical.at	2016-05-27 18:10:15.000000000 +0000
++++ tests/lexical.at	2017-01-08 22:12:13.221658776 +0000
+@@ -35,9 +35,9 @@
  AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK
  ])
  
@@ -81,60 +63,9 @@
  
  AT_DATA([comment2.csh],
  [[echo testing...@%:@\
---- tests/subst.at	2011-12-27 22:50:52.000000000 +0100
-+++ tests/subst.at	2013-02-01 08:14:25.000000000 +0100
-@@ -54,7 +54,7 @@
- , [1
- ])
- 
--AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq dnl
-+AT_CHECK([echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | grep -v "/homeless-shelter" | uniq dnl
- 	  | wc -l | tr -d ' \t'], , [1
- ])
- 
---- tests/variables.at	2011-12-27 22:50:52.000000000 +0100
-+++ tests/variables.at	2013-02-04 11:40:35.000000000 +0100
-@@ -317,17 +317,18 @@
- AT_CLEANUP
- 
- 
--AT_SETUP([$ edit])
--
--AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], ,
--[1
--])
--
--AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], ,
--[0
--])
--
--AT_CLEANUP
-+# XXX
-+#AT_SETUP([$ edit])
-+#
-+#AT_CHECK([TERM=something tcsh -f -c 'echo $?edit'], ,
-+#[1
-+#])
-+#
-+#AT_CHECK([TERM=dumb tcsh -f -c 'echo $?edit'], ,
-+#[0
-+#])
-+#
-+#AT_CLEANUP
- 
- 
- AT_SETUP([$ ellipsis])
-@@ -642,7 +643,8 @@
- ls-F -something .
- ]])
- AT_DATA([args.sh],
--[[echo "$@"
-+[[#!/bin/sh
-+echo "$@"
- ]])
- chmod a+x args.sh
- AT_CHECK([tcsh -f listflags.csh], ,
-@@ -695,55 +697,57 @@
+--- tests/variables.at	2016-09-12 16:33:54.000000000 +0000
++++ tests/variables.at	2017-01-08 22:34:56.300417919 +0000
+@@ -728,21 +728,22 @@
  AT_SETUP([$ owd])
  
  AT_DATA([owd.csh],
@@ -165,67 +96,3 @@
  ])
  
  AT_CLEANUP
- 
- 
--AT_SETUP([$ path])
--
--mkdir subdir
--AT_DATA([script.sh],
--[[echo home
--]])
--AT_DATA([subdir/script.sh],
--[[echo subdir
--]])
--chmod a+x script.sh subdir/script.sh
--AT_DATA([path.csh],
--[[echo $?path
--set path=(. subdir)
--script.sh
--set path=(subdir .)
--script.sh
--printenv PATH
--setenv PATH :foo::bar:
--echo $path
--]])
--AT_CHECK([tcsh -f path.csh], ,
--[1
--home
--subdir
--subdir:.
--. foo . bar .
--])
--
--AT_CLEANUP
-+# XXX Not sure why this does not work. "home" is printed out twice on stdout.
-+#AT_SETUP([$ path])
-+#
-+#mkdir subdir
-+#AT_DATA([script.sh],
-+#[[echo home
-+#]])
-+#AT_DATA([subdir/script.sh],
-+#[[echo subdir
-+#]])
-+#chmod a+x script.sh subdir/script.sh
-+#AT_DATA([path.csh],
-+#[[echo $?path
-+#set path=(. subdir)
-+#script.sh
-+#set path=(subdir .)
-+#script.sh
-+#printenv PATH
-+#setenv PATH :foo::bar:
-+#echo $path
-+#]])
-+#AT_CHECK([tcsh -f path.csh], ,
-+#[1
-+#home
-+#subdir
-+#subdir:.
-+#. foo . bar .
-+#])
-+#
-+#AT_CLEANUP
- 
- 
- AT_SETUP([$ printexitvalue])
diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm
index 960cb1f2a..1aee7f54c 100644
--- a/gnu/packages/shells.scm
+++ b/gnu/packages/shells.scm
@@ -5,6 +5,7 @@
 ;;; Copyright © 2015 Jeff Mickey <j@codemac.net>
 ;;; Copyright © 2016 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2016 Stefan Reichör <stefan@xsteve.at>
+;;; Copyright © 2017 ng0 <ng0@libertad.pw>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -176,7 +177,7 @@ has a small feature set similar to a traditional Bourne shell.")
   (package
     (name "tcsh")
     (replacement tcsh/fixed)
-    (version "6.18.01")
+    (version "6.20.00")
     (source (origin
               (method url-fetch)
               ;; Old tarballs are moved to old/.
@@ -186,15 +187,16 @@ has a small feature set similar to a traditional Bourne shell.")
                                         "old/tcsh-" version ".tar.gz")))
               (sha256
                (base32
-                "1a4z9kwgx1iqqzvv64si34m60gj34p7lp6rrcrb59s7ka5wa476q"))
-              (patches (search-patches "tcsh-fix-autotest.patch"
-                                       "tcsh-do-not-define-BSDWAIT.patch"))
+                "17ggxkkn5skl0v1x0j6hbv5l0sgnidfzwv16992sqkdm983fg7dq"))
+              (patches (search-patches "tcsh-fix-autotest.patch"))
               (patch-flags '("-p0"))))
     (build-system gnu-build-system)
     (inputs
      `(("autoconf" ,autoconf)
        ("coreutils" ,coreutils)
        ("ncurses" ,ncurses)))
+    (native-inputs
+     `(("perl" ,perl))) ; Used by test 122.
     (arguments
      `(#:phases
        (alist-cons-before
-- 
2.11.0

Re: [PATCH] gnu: tcsh: Update to 6.20.00.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 774 bytes --]

On Mon, Jan 09, 2017 at 12:25:01AM +0000, ng0 wrote:
> * gnu/packages/shells.scm (tcsh): Update to 6.20.00.
> [native-inputs]: Add perl.
> * gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Remove it.
> ---
>  gnu/packages/patches/tcsh-fix-autotest.patch | 151 ++-------------------------
>  gnu/packages/shells.scm                      |  10 +-
>  2 files changed, 15 insertions(+), 146 deletions(-)
> 

tcsh-do-not-define-BSDWAIT.patch was removed from the tcsh source, but
not from the repo or from gnu/local.mk. Is it used somewhere else?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH] gnu: tcsh: Update to 6.20.00.

[ng0]

Efraim Flashner <efraim@flashner.co.il> writes:

> On Mon, Jan 09, 2017 at 12:25:01AM +0000, ng0 wrote:
>> * gnu/packages/shells.scm (tcsh): Update to 6.20.00.
>> [native-inputs]: Add perl.
>> * gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Remove it.
>> ---
>>  gnu/packages/patches/tcsh-fix-autotest.patch | 151 ++-------------------------
>>  gnu/packages/shells.scm                      |  10 +-
>>  2 files changed, 15 insertions(+), 146 deletions(-)
>> 
>
> tcsh-do-not-define-BSDWAIT.patch was removed from the tcsh source, but
> not from the repo or from gnu/local.mk. Is it used somewhere else?

It is no longer necessary. This patch isn't finalized, the final
version will include the removed patchfile and solutions for the
2 remaining problems.
I will search the commit in upstream which adds this if this is
required to comment on patch removal?

> -- 
> Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
> GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
> Confidentiality cannot be guaranteed on emails sent or received unencrypted

-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

Re: [PATCH] gnu: tcsh: Update to 6.20.00.

[Ricardo Wurmus]

ng0 <ng0@libertad.pw> writes:

> * gnu/packages/shells.scm (tcsh): Update to 6.20.00.
> [native-inputs]: Add perl.
> * gnu/packages/patches/tcsh-do-not-define-BSDWAIT.patch: Remove it.
> ---
>  gnu/packages/patches/tcsh-fix-autotest.patch | 151 ++-------------------------
>  gnu/packages/shells.scm                      |  10 +-
>  2 files changed, 15 insertions(+), 146 deletions(-)

The commit message looks wrong.  It also doesn’t mention the changes to
tcsh-fix-autotest.patch.

--
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Re: TCSH: Update to 6.20.00.

[ng0]

ng0 <ng0@libertad.pw> writes:

> [PATCH] gnu: tcsh: Update to 6.20.00.
>
> This is almost fixed. Someone needs to look into failing test cases 131 and 188.
>
> The tcsh-fix-autotest.patch was updated.

For transparency and to avoid duplicate efforts: I contacted
upstream and just need to find the time to describe our build
environment to the maintainer.

> I compared the 6.19 version with 6.20 version of files and see no obvious reason for these to fail:
>
> #                             -*- compilation -*-
> 131. subst.at:29: testing Filename substitution ...
> ./subst.at:44: tcsh -f files.csh
> ./subst.at:53: echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'
> ./subst.at:57: echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq    | wc -l | tr -d ' \t'
> --- -   2017-01-08 23:36:16.461524744 +0000
> +++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/131/stdout  2017-01-08 23:36:16.458666838 +0000
> @@ -1,2 +1,2 @@
> -1
> +2
>
> 131. subst.at:29: 131. Filename substitution (subst.at:29): FAILED (subst.at:57)
>
>
>
> #                             -*- compilation -*-
> 188. variables.at:707: testing $ cdtohome ...
> ./variables.at:708: tcsh -f -c 'cd'
> --- /dev/null   2017-01-08 10:27:49.064082136 +0000
> +++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/188/stderr  2017-01-08 23:36:18.990679394 +0000
> @@ -0,0 +1 @@
> +cd: Can't change to home directory.
> ./variables.at:708: exit code was 1, expected 0
> 188. variables.at:707: 188. $ cdtohome (variables.at:707): FAILED (variables.at:708)
>
>

-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/

Re: TCSH: Update to 6.20.00.

[Ricardo Wurmus]

ng0 <contact.ng0@cryptolab.net> writes:

>> 131. subst.at:29: testing Filename substitution ...
>> ./subst.at:44: tcsh -f files.csh
>> ./subst.at:53: echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'
>> ./subst.at:57: echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq    | wc -l | tr -d ' \t'
>> --- -   2017-01-08 23:36:16.461524744 +0000
>> +++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/131/stdout  2017-01-08 23:36:16.458666838 +0000
>> @@ -1,2 +1,2 @@
>> -1
>> +2
>>
>> 131. subst.at:29: 131. Filename substitution (subst.at:29): FAILED (subst.at:57)

Does HOME contain the name of an existing directory?

>> 188. variables.at:707: testing $ cdtohome ...
>> ./variables.at:708: tcsh -f -c 'cd'
>> --- /dev/null   2017-01-08 10:27:49.064082136 +0000
>> +++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/188/stderr  2017-01-08 23:36:18.990679394 +0000
>> @@ -0,0 +1 @@
>> +cd: Can't change to home directory.
>> ./variables.at:708: exit code was 1, expected 0
>> 188. variables.at:707: 188. $ cdtohome (variables.at:707): FAILED (variables.at:708)

Same question here.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

Re: TCSH: Update to 6.20.00.

[ng0]

Ricardo Wurmus <rekado@elephly.net> writes:

> ng0 <contact.ng0@cryptolab.net> writes:
>
>>> 131. subst.at:29: testing Filename substitution ...
>>> ./subst.at:44: tcsh -f files.csh
>>> ./subst.at:53: echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'
>>> ./subst.at:57: echo "echo ~$(id -un)/foo; echo \"$HOME/foo\"" | tcsh -f | uniq    | wc -l | tr -d ' \t'
>>> --- -   2017-01-08 23:36:16.461524744 +0000
>>> +++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/131/stdout  2017-01-08 23:36:16.458666838 +0000
>>> @@ -1,2 +1,2 @@
>>> -1
>>> +2
>>>
>>> 131. subst.at:29: 131. Filename substitution (subst.at:29): FAILED (subst.at:57)
>
> Does HOME contain the name of an existing directory?
>
>>> 188. variables.at:707: testing $ cdtohome ...
>>> ./variables.at:708: tcsh -f -c 'cd'
>>> --- /dev/null   2017-01-08 10:27:49.064082136 +0000
>>> +++ /tmp/guix-build-tcsh-6.20.00.drv-0/tcsh-6.20.00/testsuite.dir/at-groups/188/stderr  2017-01-08 23:36:18.990679394 +0000
>>> @@ -0,0 +1 @@
>>> +cd: Can't change to home directory.
>>> ./variables.at:708: exit code was 1, expected 0
>>> 188. variables.at:707: 188. $ cdtohome (variables.at:707): FAILED (variables.at:708)
>
> Same question here.
>
> -- 
> Ricardo
>
> GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
> https://elephly.net
>

I don't know if I tried to setenv home and HOME, but I can try.

The upstream dev asked similar questions so far, I wasn't able to
respond there so far:


Well both are related to home directory
When you execute this tcsh interactively what do the following
commands print:

> echo $HOME
> echo $home
> echo ~

christos


-- 
♥Ⓐ  ng0 -- https://www.inventati.org/patternsinthechaos/