Skip to content

Commit

Permalink
adjust testsuite to pass also with newer coreutils-9.6
Browse files Browse the repository at this point in the history
cat used to quote its invocation path in its error message,
then started using only its basename
  • Loading branch information
mvidner committed Jan 20, 2025
1 parent a16fc0b commit 8c92eb6
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions agent-system/testsuite/tests/bash.err
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[bash] ShellCommand.cc(shellcommand):78 /bin/cat: tests/missing: No such file or directory
[bash] ShellCommand.cc(shellcommand):78 /bin/cat: tests/missing: No such file or directory
[bash] ShellCommand.cc(shellcommand):78 /bin/cat: tests/missing: No such file or directory
[bash] ShellCommand.cc(shellcommand):78 cat: tests/missing: No such file or directory
[bash] ShellCommand.cc(shellcommand):78 cat: tests/missing: No such file or directory
[bash] ShellCommand.cc(shellcommand):78 cat: tests/missing: No such file or directory
2 changes: 1 addition & 1 deletion agent-system/testsuite/tests/bash.out
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
(1)
($["exit":0, "stderr":"", "stdout":""])
($["exit":0, "stderr":"", "stdout":"Software is like sex. It's better when it's free.\n"])
($["exit":1, "stderr":"/bin/cat: tests/missing: No such file or directory\n", "stdout":""])
($["exit":1, "stderr":"cat: tests/missing: No such file or directory\n", "stdout":""])
($["exit":42, "stderr":"", "stdout":"life\n"])
(true)
(true)
Expand Down
6 changes: 3 additions & 3 deletions agent-system/testsuite/tests/bash.ycp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
}

{
return SCR::Execute (.bash, "/bin/cat tests/missing");
return SCR::Execute (.bash, "cat tests/missing");
}

{
Expand All @@ -27,7 +27,7 @@
}

{
return SCR::Execute (.bash_output, "/bin/cat tests/missing");
return SCR::Execute (.bash_output, "cat tests/missing");
}

{
Expand All @@ -47,7 +47,7 @@
}

{
any ret = SCR::Execute (.bash_background, "/bin/cat tests/missing") == 0;
any ret = SCR::Execute (.bash_background, "cat tests/missing") == 0;
sleep(1000);
return ret;
}

0 comments on commit 8c92eb6

Please sign in to comment.