github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-01-19 20:12:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix some tests for OpenIndiana

Browse Source 
Slightly different output and status - false returns 255, ls doesn't
say it's "ls" in the error.
This commit is contained in:
Fabian Homborg 2021-06-24 18:14:45 +02:00
parent aae3a78934
commit 49bac252f6
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/checks/features-nocaret5.fish
View File

@ -1,2 +1,2 @@
#RUN: %fish --features no-stderr-nocaret -c 'ls /abavojijsdfhdsjhfuihifoisj ^&1'
# CHECK: ls: {{.*}}
# CHECK: {{ls|/abavojijsdfhdsjhfuihifoisj}}: {{.*}}

8
tests/checks/pipestatus.fish
View File

@ -18,13 +18,13 @@ echo $pipestatus : $status
# Note: On some systems `command false` fails with 255, not 1. We allow both.
command false | command false | command false
echo $pipestatus : $status
#CHECK: {{1|255}} {{1|255}} {{1|255}} : 1
#CHECK: {{1|255}} {{1|255}} {{1|255}} : {{1|255}}
command true | command true | command true
echo $pipestatus : $status
#CHECK: 0 0 0 : 0
command false | command true | command false
echo $pipestatus : $status
#CHECK: {{1|255}} 0 {{1|255}} : 1
#CHECK: {{1|255}} 0 {{1|255}} : {{1|255}}
command true | command false | command true
echo $pipestatus : $status
#CHECK: 0 {{1|255}} 0 : 0
@ -38,7 +38,7 @@ echo $pipestatus : $status
#CHECK: 0 0 0 : 0
false | command true | command false
echo $pipestatus : $status
#CHECK: 1 0 {{1|255}} : 1
#CHECK: 1 0 {{1|255}} : {{1|255}}
true | false | command true
echo $pipestatus : $status
#CHECK: 0 1 0 : 0
@ -64,7 +64,7 @@ echo $pipestatus : $status
#CHECK: 0 : 0
command false
echo $pipestatus : $status
#CHECK: {{1|255}} : 1
#CHECK: {{1|255}} : {{1|255}}
sh -c 'exit 4'
echo $pipestatus : $status
#CHECK: 4 : 4

5
tests/checks/signal.fish
View File

@ -36,7 +36,8 @@ end
echo "command false:"
command false
# CHECK: command false:
# CHECK: PROCESS_EXIT 1
# (Solaris' false exits with 255, not 1)
# CHECK: PROCESS_EXIT {{1|255}}
# CHECK: JOB_EXIT 0
echo "command true:"
@ -48,7 +49,7 @@ command true
echo "command false | true:"
command false | command true
# CHECK: command false | true:
# CHECK: PROCESS_EXIT 1
# CHECK: PROCESS_EXIT {{1|255}}
# CHECK: PROCESS_EXIT 0
# CHECK: JOB_EXIT 0

3
tests/checks/wait.fish
View File

@ -35,4 +35,5 @@ sleep .1
function waiter --on-process-exit $pid
echo exited $argv
end
# CHECK: exited PROCESS_EXIT {{\d+}} 1
# (Solaris' false exits with 255, not 1)
# CHECK: exited PROCESS_EXIT {{\d+}} {{1|255}}