Merge pull request #5441 from n1000/test_ot_fix

test: use mtime for -ot and fix direction of comparison
This commit is contained in:
Sylvestre Ledru
2023-10-23 20:59:30 +02:00
committed by GitHub
2 changed files with 15 additions and 5 deletions
+1 -1
View File
@@ -218,7 +218,7 @@ fn files(a: &OsStr, b: &OsStr, op: &OsStr) -> ParseResult<bool> {
#[cfg(not(unix))]
Some("-ef") => unimplemented!(),
Some("-nt") => f_a.modified().unwrap() > f_b.modified().unwrap(),
Some("-ot") => f_a.created().unwrap() > f_b.created().unwrap(),
Some("-ot") => f_a.modified().unwrap() < f_b.modified().unwrap(),
_ => return Err(ParseError::UnknownOperator(op.quote().to_string())),
})
}
+14 -4
View File
@@ -317,7 +317,7 @@ fn test_file_is_itself() {
}
#[test]
#[cfg(not(any(target_env = "musl", target_os = "android")))]
#[cfg(not(target_os = "android"))]
fn test_file_is_newer_than_and_older_than_itself() {
// odd but matches GNU
new_ucmd!()
@@ -364,8 +364,7 @@ fn test_same_device_inode() {
}
#[test]
#[cfg(not(any(target_env = "musl", target_os = "android")))]
// musl: creation time is not available on this platform currently
#[cfg(not(target_os = "android"))]
fn test_newer_file() {
let scenario = TestScenario::new(util_name!());
@@ -377,10 +376,21 @@ fn test_newer_file() {
.ucmd()
.args(&["newer_file", "-nt", "regular_file"])
.succeeds();
scenario
.ucmd()
.args(&["regular_file", "-nt", "newer_file"])
.fails();
scenario
.ucmd()
.args(&["regular_file", "-ot", "newer_file"])
.succeeds();
scenario
.ucmd()
.args(&["newer_file", "-ot", "regular_file"])
.succeeds();
.fails();
}
#[test]