gnu: tcsh: Update to 6.24.15.

* gnu/packages/shells.scm (tcsh): Update to 6.24.15.
* gnu/packages/patches/tcsh-fix-autotest.patch: Adjust it.

Change-Id: Ia9ac5f23fd4107d6c94818c62f5d997042c41535
This commit is contained in:
Zheng Junjie 2025-02-08 02:23:24 +08:00 committed by Andreas Enge
parent f982ca32f9
commit 5b6a613da7
No known key found for this signature in database
GPG key ID: F7D5C9BF765C61E3
2 changed files with 25 additions and 35 deletions

View file

@ -1,11 +1,15 @@
--- tests/commands.at --- tests/commands.at
+++ tests/commands.at +++ tests/commands.at
@@ -921,26 +921,27 @@ AT_CLEANUP @@ -1084,27 +1084,28 @@
TCSH_UNTESTED([notify]) dnl onintr
dnl
-AT_SETUP([onintr]) -AT_SETUP([onintr])
- -AT_KEYWORDS([commands])
+# XXX This test does not work: "fail" is printed on stdout.
+#AT_SETUP([onintr])
+#AT_KEYWORDS([commands])
-AT_DATA([onintr.csh], -AT_DATA([onintr.csh],
-[[onintr label -[[onintr label
-kill -INT $$ -kill -INT $$
@ -23,10 +27,7 @@
-OK -OK
-]) -])
- -
-AT_CLEANUP -AT_CLEANUP()
+# XXX This test does not work: "fail" is printed on stdout.
+#AT_SETUP([onintr])
+#
+#AT_DATA([onintr.csh], +#AT_DATA([onintr.csh],
+#[[onintr label +#[[onintr label
+#kill -INT $$ +#kill -INT $$
@ -44,28 +45,13 @@
+#OK +#OK
+#]) +#])
+# +#
+#AT_CLEANUP +#AT_CLEANUP()
AT_SETUP([popd]) dnl
--- tests/lexical.at
+++ tests/lexical.at
@@ -35,9 +35,9 @@ AT_CHECK([if [ ! -t 0 ]; then exit 77; fi],, [Skipping comment tests])
AT_CHECK([echo 'echo OK@%:@comment' | tcsh -f], , [OK
])
-AT_CHECK([tcsh -f -c 'echo @%:@no comment'], ,
-[@%:@no comment
-])
+#AT_CHECK([tcsh -f -c 'echo @%:@no comment'], ,
+#[@%:@no comment
+#])
AT_DATA([comment2.csh],
[[echo testing...@%:@\
--- tests/variables.at --- tests/variables.at
+++ tests/variables.at +++ tests/variables.at
@@ -666,7 +666,8 @@ set listflags=(-xA $cwd/args.sh) @@ -963,7 +963,8 @@
ls-F -something . ls-F -something .
]]) ]])
AT_DATA([args.sh], AT_DATA([args.sh],
@ -75,8 +61,8 @@
]]) ]])
chmod a+x args.sh chmod a+x args.sh
AT_CHECK([tcsh -f listflags.csh], , AT_CHECK([tcsh -f listflags.csh], ,
@@ -728,55 +729,57 @@ TCSH_UNTESTED([$ oid]) @@ -1144,21 +1145,22 @@
AT_SETUP([$ owd]) AT_KEYWORDS([variables])
AT_DATA([owd.csh], AT_DATA([owd.csh],
-[[echo $owd -[[echo $owd
@ -105,10 +91,13 @@
+CWD/a/b +CWD/a/b
]) ])
AT_CLEANUP AT_CLEANUP()
@@ -1168,36 +1170,37 @@
dnl $ path
dnl
-AT_SETUP([$ path]) -AT_SETUP([$ path])
-AT_KEYWORDS([variables])
- -
-mkdir subdir -mkdir subdir
-AT_DATA([script.sh], -AT_DATA([script.sh],
@ -136,9 +125,10 @@
-. foo . bar . -. foo . bar .
-]) -])
- -
-AT_CLEANUP -AT_CLEANUP()
+# XXX Not sure why this does not work. "home" is printed out twice on stdout. +# XXX Not sure why this does not work. "home" is printed out twice on stdout.
+#AT_SETUP([$ path]) +#AT_SETUP([$ path])
+#AT_KEYWORDS([variables])
+# +#
+#mkdir subdir +#mkdir subdir
+#AT_DATA([script.sh], +#AT_DATA([script.sh],
@ -166,7 +156,7 @@
+#. foo . bar . +#. foo . bar .
+#]) +#])
+# +#
+#AT_CLEANUP +#AT_CLEANUP()
AT_SETUP([$ printexitvalue]) dnl

View file

@ -390,7 +390,7 @@ written by Paul Haahr and Byron Rakitzis.")
(define-public tcsh (define-public tcsh
(package (package
(name "tcsh") (name "tcsh")
(version "6.24.01") (version "6.24.15")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
;; Old tarballs are moved to old/. ;; Old tarballs are moved to old/.
@ -400,7 +400,7 @@ written by Paul Haahr and Byron Rakitzis.")
"old/tcsh-" version ".tar.gz"))) "old/tcsh-" version ".tar.gz")))
(sha256 (sha256
(base32 (base32
"0zhxp4m1fxyd3a2qyvs97gzlrb0h0ah1gjrqcbilgydiffws2nan")) "1z931m79hd7zp066s57mcifzig3byfg3ak7432jmf3rjvyjb5l6l"))
(patches (search-patches "tcsh-fix-autotest.patch")) (patches (search-patches "tcsh-fix-autotest.patch"))
(patch-flags '("-p0")))) (patch-flags '("-p0"))))
(build-system gnu-build-system) (build-system gnu-build-system)