Tail macos stdin ran from script fix #7844

hz2 · 2025-04-25T23:40:39Z

causes test_stdin_redirect_dir_when_target_os_is_macos to fail, though may need more context on what this was testing.

thread 'test_tail::test_stdin_redirect_dir_when_target_os_is_macos' panicked at tests/by-util/test_tail.rs:340:10:
assertion failed: `(left == right)`

Diff < left / right > :
<tail: Is a directory
>tail: cannot open 'standard input' for reading: No such file or directory

github-actions · 2025-04-26T00:36:34Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)
Skipping an intermittent issue tests/timeout/timeout (passes in this run but fails in the 'main' branch)

github-actions · 2025-04-26T01:55:13Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/tee (passes in this run but fails in the 'main' branch)

github-actions · 2025-04-26T18:36:26Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

- introduce macOS-specific config guard - added test for testing tail stdin when redirected (`>`) from file and when through a pipe (`|`)

added drop line

hz2 · 2025-04-26T20:07:30Z

the comment above the test_stdin_redirect_dir_when_target_os_is_macos:

// On macOS path.is_dir() can be false for directories if it was a redirect,
// e.g. `$ tail < DIR. The library feature to detect the
// std::io::ErrorKind::IsADirectory isn't stable so we currently show the a wrong
// error message.
// FIXME: If `std::io::ErrorKind::IsADirectory` becomes stable or macos handles
//  redirected directories like linux show the correct message like in
//  `test_stdin_redirect_dir`

and is testing:

$ mkdir dir
$ tail < dir, $ tail - < dir
tail: error reading 'standard input': Is a directory

the differences between the error messages on what i see on my mac-m1 using GNU's tail and uutil's can be shown in the following changes to test_stdin_redirect_dir_when_target_os_is_macos:

    ts.ucmd()
        ...
        // .stderr_is("tail: stdin: Is a directory\n"); expected message macOS shows with GNU
        .stderr_is("tail: Is a directory\n"); // actual message we show
    ts.ucmd()
        ...
        // .stderr_is("tail: -: No such file or directory\n"); expected message macOS shows with GNU
        .stderr_is("tail: Is a directory\n"); // actual message we show

which should be handled but since functionality when running from a script is failing, this test should be ignored for now.

github-actions · 2025-04-26T20:39:37Z

GNU testsuite comparison:

Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

github-actions · 2025-04-26T22:45:02Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/tee (fails in this run but passes in the 'main' branch)
Skip an intermittent issue tests/timeout/timeout (fails in this run but passes in the 'main' branch)

Copilot

Pull Request Overview

This PR addresses issue #7763 by disabling a failing test on macOS and adding an additional test to validate tail’s behavior when reading from a script via redirection and piping on Unix systems. It also adjusts the input handling logic in tail’s source to resolve discrepancies in behavior between macOS and other Unix platforms.

Disabled the test_stdin_redirect_dir_when_target_os_is_macos on macOS.
Added a new test, test_stdin_via_script_redirection_and_pipe, to cover script redirection and piping.
Updated the Input handling in paths.rs to return None on macOS and to canonicalize fd0 on non-macOS systems.

Reviewed Changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.

File	Description
tests/by-util/test_tail.rs	Ignores a failing macOS test and adds a new test for script redirection.
src/uu/tail/src/paths.rs	Modifies Input handling to differentiate between macOS and other Unix.

Comments suppressed due to low confidence (2)

tests/by-util/test_tail.rs:352

The new test is enabled under #[cfg(unix)] and may execute on macOS, where the behavior of tail for script redirection differs. Consider adding a more specific configuration guard (e.g., #[cfg(not(target_vendor = "apple"))]) if the expected output on macOS is different.

fn test_stdin_via_script_redirection_and_pipe() {

src/uu/tail/src/paths.rs:81

The macOS-specific branch returns None for Input handling. Verify that this change consistently supports both redirection and piping scenarios on macOS, or consider documenting the rationale to avoid future confusion.

#[cfg(target_os = "macos")]

sylvestre · 2025-04-27T21:59:50Z

tests/by-util/test_tail.rs

@@ -324,6 +324,7 @@ fn test_stdin_redirect_dir() {
 //  `test_stdin_redirect_dir`
 #[test]
 #[cfg(target_vendor = "apple")]
+#[ignore = "disabled until fixed"]


I would prefer you fix that before we merge this PR :)

fixed in latest commit!

… a check to handle error message

github-actions · 2025-04-27T23:10:03Z

GNU testsuite comparison:

Skip an intermittent issue tests/misc/stdbuf (fails in this run but passes in the 'main' branch)
Congrats! The gnu test tests/rm/empty-inacc is no longer failing!

sylvestre · 2025-04-27T23:18:22Z

tests/by-util/test_tail.rs

@@ -346,6 +346,54 @@ fn test_stdin_redirect_dir_when_target_os_is_macos() {
        .stderr_is("tail: cannot open 'standard input' for reading: No such file or directory\n");
 }

+#[test]
+#[cfg(unix)]


seems that it is failing on freebsd:

──── TRY 1 STDOUT: coreutils::tests test_tail::test_stdin_via_script_redirection_and_pipe running 1 test bin: "/home/runner/work/coreutils/coreutils/target/debug/coreutils" write(default): /tmp/.tmpqaoG0W/file.txt run: sh -c ./test.sh < file.txt test test_tail::test_stdin_via_script_redirection_and_pipe ... FAILED failures: failures: test_tail::test_stdin_via_script_redirection_and_pipe test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 3718 filtered out; finished in 0.04s ──── TRY 1 STDERR: coreutils::tests test_tail::test_stdin_via_script_redirection_and_pipe thread 'test_tail::test_stdin_via_script_redirection_and_pipe' panicked at tests/by-util/test_tail.rs:385:10: Command was expected to succeed. code: 127 stdout = stderr = sh: ./test.sh: not found stack backtrace: 0: rust_begin_unwind at /rustc/05f9846f893b09a1be1fc8560e33fc3c815cfecb/library/std/src/panicking.rs:695:5 1: core::panicking::panic_fmt at /rustc/05f9846f893b09a1be1fc8560e33fc3c815cfecb/library/core/src/panicking.rs:75:14 2: uutests::util::CmdResult::success at ./tests/uutests/src/lib/util.rs:442:9 3: uutests::util::UCommand::succeeds at ./tests/uutests/src/lib/util.rs:1929:9 4: tests::test_tail::test_stdin_via_script_redirection_and_pipe at ./tests/by-util/test_tail.rs:381:5 5: tests::test_tail::test_stdin_via_script_redirection_and_pipe::{{closure}} at ./tests/by-util/test_tail.rs:351:48 6: core::ops::function::FnOnce::call_once at /rustc/05f9846f893b09a1be1fc8560e33fc3c815cfecb/library/core/src/ops/function.rs:250:5 7: core::ops::function::FnOnce::call_once at /rustc/05f9846f893b09a1be1fc8560e33fc3c815cfecb/library/core/src/ops/function.rs:250:5 note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

thanks for pointing this out, subtleties in FreeBSD

github-actions · 2025-04-28T00:52:47Z

GNU testsuite comparison:

Skipping an intermittent issue tests/misc/stdbuf (passes in this run but fails in the 'main' branch)

hz2 force-pushed the tail-macos-stdin-fix branch from 4e4bee7 to 1880010 Compare April 26, 2025 01:20

hz2 force-pushed the tail-macos-stdin-fix branch from ed4659c to abf730b Compare April 26, 2025 17:44

hz2 force-pushed the tail-macos-stdin-fix branch from 6864d8d to 4eb15ca Compare April 26, 2025 19:51

hz2 added 2 commits April 26, 2025 13:03

fixes uutils#7763

cf2331a

- introduce macOS-specific config guard - added test for testing tail stdin when redirected (`>`) from file and when through a pipe (`|`)

created test to mock behavior in uutils#7763, with comments

3c2e83a

added drop line

hz2 force-pushed the tail-macos-stdin-fix branch from 4eb15ca to 3c2e83a Compare April 26, 2025 20:05

Merge branch 'main' into tail-macos-stdin-fix

6b5f6dd

hz2 marked this pull request as ready for review April 27, 2025 00:52

sylvestre requested a review from Copilot April 27, 2025 21:59

Copilot AI reviewed Apr 27, 2025

View reviewed changes

sylvestre reviewed Apr 27, 2025

View reviewed changes

re-enabled test_stdin_redirect_dir_when_target_os_is_macos, and added…

ecc8a9a

… a check to handle error message

sylvestre reviewed Apr 27, 2025

View reviewed changes

hz2 added 3 commits April 27, 2025 16:43

added location of current directory so test env can find script

7bc5f8c

adjusting to try to have FreeBSD find the file in CI test

7008e79

putting in /env instead of assuming bash

a0e4f60

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tail macos stdin ran from script fix #7844

Tail macos stdin ran from script fix #7844

hz2 commented Apr 25, 2025

github-actions bot commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

hz2 commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

Copilot AI left a comment

sylvestre Apr 27, 2025

hz2 Apr 27, 2025

github-actions bot commented Apr 27, 2025

sylvestre Apr 27, 2025

hz2 Apr 28, 2025

github-actions bot commented Apr 28, 2025

Tail macos stdin ran from script fix #7844

Are you sure you want to change the base?

Tail macos stdin ran from script fix #7844

Conversation

hz2 commented Apr 25, 2025

github-actions bot commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

hz2 commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

github-actions bot commented Apr 26, 2025

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

sylvestre Apr 27, 2025

Choose a reason for hiding this comment

hz2 Apr 27, 2025

Choose a reason for hiding this comment

github-actions bot commented Apr 27, 2025

sylvestre Apr 27, 2025

Choose a reason for hiding this comment

hz2 Apr 28, 2025

Choose a reason for hiding this comment

github-actions bot commented Apr 28, 2025