Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Disabling compare_xattrs cp and mv related tests on OpenBSD
Browse files Browse the repository at this point in the history
The test_cp and test_mv have xattr related tests. They should
be disabled on OpenBSD after commit 19d42c0 disabled the
compare_xattrs function on OpenBSD.

Fixes #6348
jadijadi committed May 6, 2024
1 parent 421f3a9 commit 51c89ec
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions tests/by-util/test_cp.rs
Original file line number Diff line number Diff line change
@@ -56,7 +56,7 @@ static TEST_MOUNT_MOUNTPOINT: &str = "mount";
static TEST_MOUNT_OTHER_FILESYSTEM_FILE: &str = "mount/DO_NOT_copy_me.txt";

Check failure on line 56 in tests/by-util/test_cp.rs

GitHub Actions / Style/format (ubuntu-latest, feat_os_unix)

ERROR: `cargo fmt`: style violation (file:'tests/by-util/test_cp.rs', line:56; use `cargo fmt -- "tests/by-util/test_cp.rs"`)

Check failure on line 56 in tests/by-util/test_cp.rs

GitHub Actions / Style and Lint (ubuntu-22.04, unix)

ERROR: `cargo fmt`: style violation (file:'tests/by-util/test_cp.rs', line:56; use `cargo fmt -- "tests/by-util/test_cp.rs"`)
#[cfg(unix)]
static TEST_NONEXISTENT_FILE: &str = "nonexistent_file.txt";
#[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))]
#[cfg(all(unix, not(any(target_os = "android", target_os = "macos", target_os = "openbsd"))))]
use crate::common::util::compare_xattrs;

/// Assert that mode, ownership, and permissions of two metadata objects match.
@@ -3692,7 +3692,7 @@ fn test_cp_no_such() {
.stderr_is("cp: 'no-such/' is not a directory\n");

Check failure on line 3692 in tests/by-util/test_cp.rs

GitHub Actions / Style/format (ubuntu-latest, feat_os_unix)

ERROR: `cargo fmt`: style violation (file:'tests/by-util/test_cp.rs', line:3692; use `cargo fmt -- "tests/by-util/test_cp.rs"`)

Check failure on line 3692 in tests/by-util/test_cp.rs

GitHub Actions / Style and Lint (ubuntu-22.04, unix)

ERROR: `cargo fmt`: style violation (file:'tests/by-util/test_cp.rs', line:3692; use `cargo fmt -- "tests/by-util/test_cp.rs"`)
}

#[cfg(all(unix, not(any(target_os = "android", target_os = "macos"))))]
#[cfg(all(unix, not(any(target_os = "android", target_os = "macos", target_os = "openbsd"))))]
#[test]
fn test_acl_preserve() {
use std::process::Command;
2 changes: 1 addition & 1 deletion tests/by-util/test_mv.rs
Original file line number Diff line number Diff line change
@@ -1569,7 +1569,7 @@ fn test_mv_dir_into_path_slash() {
assert!(at.dir_exists("f/b"));
}

#[cfg(all(unix, not(target_os = "macos")))]
#[cfg(all(unix, not(any(target_os = "macos", target_os = "openbsd"))))]
#[test]
fn test_acl() {
use std::process::Command;

0 comments on commit 51c89ec

Please sign in to comment.