From 8f5b785180c0a97524f7a5c0a698467c7a1e8bd1 Mon Sep 17 00:00:00 2001 From: Jeffrey Finkelstein Date: Sun, 1 Aug 2021 10:05:01 -0400 Subject: [PATCH] fixup! basename: handle paths comprising only slashes --- tests/by-util/test_basename.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/by-util/test_basename.rs b/tests/by-util/test_basename.rs index 4a3e6914a..f7332af5f 100644 --- a/tests/by-util/test_basename.rs +++ b/tests/by-util/test_basename.rs @@ -150,7 +150,8 @@ fn invalid_utf8_args_unix() { #[test] fn test_root() { - new_ucmd!().arg("/").succeeds().stdout_is("/\n"); + let expected = if cfg!(windows) { "\\\n" } else { "/\n" }; + new_ucmd!().arg("/").succeeds().stdout_is(expected); } #[test] @@ -158,7 +159,7 @@ fn test_double_slash() { // TODO The GNU tests seem to suggest that some systems treat "//" // as the same directory as "/" directory but not all systems. We // should extend this test to account for that possibility. - let expected = if cfg!(windows) { "\\" } else { "/\n" }; + let expected = if cfg!(windows) { "\\\n" } else { "/\n" }; new_ucmd!().arg("//").succeeds().stdout_is(expected); new_ucmd!() .args(&["//", "/"]) @@ -172,5 +173,6 @@ fn test_double_slash() { #[test] fn test_triple_slash() { - new_ucmd!().arg("///").succeeds().stdout_is("/\n"); + let expected = if cfg!(windows) { "\\\n" } else { "/\n" }; + new_ucmd!().arg("///").succeeds().stdout_is(expected); }