--- tests/commands.at +++ tests/commands.at @@ -921,26 +921,27 @@ AT_CLEANUP TCSH_UNTESTED([notify]) -AT_SETUP([onintr]) - -AT_DATA([onintr.csh], -[[onintr label -kill -INT $$ -echo fail -label: -echo caught -onintr - -kill -INT $$ -echo OK -onintr - -kill -INT $$ -]]) -AT_CHECK([tcsh -f onintr.csh], , -[caught -OK -]) - -AT_CLEANUP +# XXX This test does not work: "fail" is printed on stdout. +#AT_SETUP([onintr]) +# +#AT_DATA([onintr.csh], +#[[onintr label +#kill -INT $$ +#echo fail +#label: +#echo caught +#onintr - +#kill -INT $$ +#echo OK +#onintr - +#kill -INT $$ +#]]) +#AT_CHECK([tcsh -f onintr.csh], , +#[caught +#OK +#]) +# +#AT_CLEANUP AT_SETUP([popd]) --- 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...@%:@\ @@ -567,10 +567,10 @@ run=3 # Adapt to changes in sed 4.3: # https://github.com/tcsh-org/tcsh/commit/2ad4fc1705893207598ed5cd21713ddf3f17bba0 ]]) AT_DATA([uniformity_test.csh], [[ -set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` +set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'` echo -n "$SERVICE_NAME_LOG" > ./output1 -cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 +cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g' | perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2 diff -uprN ./output1 ./output2 >& /dev/null @@ -587,7 +587,7 @@ AT_DATA([quoting_result_test.csh], echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))" -set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` +set SERVICE_NAME_LOG = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'` echo "$SERVICE_NAME_LOG" > ./actual_result --- tests/subst.at +++ tests/subst.at @@ -54,7 +54,7 @@ AT_CHECK([echo 'echo ~; echo "$HOME"' | tcsh -f | uniq | wc -l | tr -d ' \t'], , [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 +++ tests/variables.at @@ -666,7 +666,8 @@ set listflags=(-xA $cwd/args.sh) ls-F -something . ]]) AT_DATA([args.sh], -[[echo "$@" +[[#!/bin/sh +echo "$@" ]]) chmod a+x args.sh AT_CHECK([tcsh -f listflags.csh], , @@ -704,9 +705,9 @@ AT_CHECK([tcsh -f mail.csh], , # This test fails by trying to change to the build user's home # directory, which does not exist. AT_CLEANUP -AT_SETUP([$ cdtohome]) -AT_CHECK([tcsh -f -c 'cd'], 0) -AT_CLEANUP +#AT_SETUP([$ cdtohome]) +#AT_CHECK([tcsh -f -c 'cd'], 0) +#AT_CLEANUP AT_SETUP([$ noimplicithome]) AT_CHECK([tcsh -f -c 'unset cdtohome; cd'], 1, , [cd: Too few arguments. ]) @@ -728,55 +729,57 @@ TCSH_UNTESTED([$ oid]) AT_SETUP([$ owd]) AT_DATA([owd.csh], -[[echo $owd -cd / +[[mkdir -p a/b/ echo $owd -pushd /bin +cd a +echo $owd +pushd b echo $owd popd echo $owd ]]) -AT_CHECK([tcsh -f owd.csh | sed "s,$PWD,CWD,"], , +AT_CHECK([tcsh -f owd.csh | sed "s,$PWD,CWD,g"], , [ CWD -/bin / @&t@ -/ -/ @&t@ -/bin +CWD/a/b CWD/a @&t@ +CWD/a +CWD/a @&t@ +CWD/a/b ]) 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]) pan class='msg-avail'>...Maxim Cournoyer 2021-06-29pack: Add support for the deb format....Maxim Cournoyer 2021-05-10Update NEWS.Maxim Cournoyer 2021-05-10Update NEWS.Leo Famulari 2021-05-10Update NEWS.Ludovic Courtès 2021-05-04Update NEWS.Ludovic Courtès 2020-11-22Update NEWS.Ludovic Courtès 2020-11-13Update NEWS.Ludovic Courtès 2020-11-09Update NEWS.Ludovic Courtès 2020-11-07Update NEWS.Mathieu Othacehe 2020-11-07Update NEWS.Ludovic Courtès 2020-11-05Update NEWS.Ludovic Courtès